gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1303 from nextcloud/bugfix/1274/preventTextSelection

Browse Source 
Prevent text selection on messages
This commit is contained in:
Andy Scherzinger 2021-05-31 13:53:55 +02:00 committed by GitHub
commit a092f30d56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/item_custom_incoming_text_message.xml
View File

@ -55,6 +55,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:textColor="@color/textColorMaxContrast" android:textColor="@color/textColorMaxContrast"
android:textIsSelectable="false"
android:textSize="12sp" /> android:textSize="12sp" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
@ -62,7 +63,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:textIsSelectable="true" android:textIsSelectable="false"
app:layout_alignSelf="flex_start" app:layout_alignSelf="flex_start"
app:layout_flexGrow="1" app:layout_flexGrow="1"
app:layout_wrapBefore="true" /> app:layout_wrapBefore="true" />
@ -73,6 +74,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:textIsSelectable="false"
app:layout_alignSelf="center" /> app:layout_alignSelf="center" />
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>

9
app/src/main/res/layout/item_custom_outcoming_text_message.xml
View File

@ -50,8 +50,8 @@
android:layout_alignWithParentIfMissing="true" android:layout_alignWithParentIfMissing="true"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:textColorHighlight="@color/nc_grey" android:textColorHighlight="@color/nc_grey"
android:textIsSelectable="true" android:textIsSelectable="false"
tools:text="Talk to ayou later!" /> tools:text="Talk to you later!" />
<TextView <TextView
android:id="@id/messageTime" android:id="@id/messageTime"
@ -59,6 +59,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:textIsSelectable="false"
app:layout_alignSelf="center" app:layout_alignSelf="center"
tools:text="10:35" /> tools:text="10:35" />
@ -68,8 +69,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageTime" android:layout_below="@id/messageTime"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app:layout_alignSelf="center" android:contentDescription="@null"
android:contentDescription="@null" /> app:layout_alignSelf="center" />
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout/item_message_quote.xml
View File

@ -46,6 +46,7 @@
android:layout_toEndOf="@id/quoteColoredView" android:layout_toEndOf="@id/quoteColoredView"
android:ellipsize="end" android:ellipsize="end"
android:textColor="@color/textColorMaxContrast" android:textColor="@color/textColorMaxContrast"
android:textIsSelectable="false"
android:textSize="12sp" android:textSize="12sp"
tools:text="Jane Doe" /> tools:text="Jane Doe" />
@ -82,6 +83,7 @@
android:layout_below="@id/quotedMessageImage" android:layout_below="@id/quotedMessageImage"
android:layout_alignStart="@id/quotedMessageAuthor" android:layout_alignStart="@id/quotedMessageAuthor"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:textIsSelectable="false"
android:textSize="14sp" android:textSize="14sp"
app:layout_alignSelf="flex_start" app:layout_alignSelf="flex_start"
app:layout_flexGrow="1" app:layout_flexGrow="1"