From e2ed2391ca5fb15d30907d12c8a738c219740b22 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 22 Jan 2024 22:21:31 -0500 Subject: [PATCH] Rounded textsend --- src/cheogram/res/drawable/textsend.xml | 9 +++++++++ .../siacs/conversations/ui/ConversationFragment.java | 3 +++ src/main/res/layout/fragment_conversation.xml | 11 ++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 src/cheogram/res/drawable/textsend.xml diff --git a/src/cheogram/res/drawable/textsend.xml b/src/cheogram/res/drawable/textsend.xml new file mode 100644 index 0000000000000000000000000000000000000000..701ded3a9b8981a1a83cba013a29f7868a8f89cd --- /dev/null +++ b/src/cheogram/res/drawable/textsend.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 32a91b14b0c388c232b78ce77bdb875b04d9032b..afc11fc5ec45f64914cedab9cc6ed7b82c5c37b3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -149,6 +149,7 @@ import eu.siacs.conversations.ui.util.ScrollState; import eu.siacs.conversations.ui.util.SendButtonAction; import eu.siacs.conversations.ui.util.SendButtonTool; import eu.siacs.conversations.ui.util.ShareUtil; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.ViewUtil; import eu.siacs.conversations.ui.widget.EditMessage; import eu.siacs.conversations.utils.AccountUtils; @@ -1565,6 +1566,7 @@ public class ConversationFragment extends XmppFragment conversation.setReplyTo(message); if (message == null) { binding.contextPreview.setVisibility(View.GONE); + binding.textsend.setBackgroundResource(R.drawable.textsend); return; } @@ -1573,6 +1575,7 @@ public class ConversationFragment extends XmppFragment messageListAdapter.handleTextQuotes(body, activity.isDarkTheme()); binding.contextPreviewText.setText(body); binding.contextPreview.setVisibility(View.VISIBLE); + binding.textsend.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_primary)); } private void setThread(Element thread) { diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index d8871be5d8bbd0fa6199196f9b74d2575c212f37..a86f813e8ad235226df37b5b8d57a0f4578ab231 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -61,7 +61,7 @@ android:paddingLeft="8dp" android:paddingRight="14dp" android:orientation="horizontal" - android:background="?attr/color_background_primary"> + android:background="@drawable/textsend"> + android:clipToPadding="true" + android:background="@drawable/textsend"> @@ -199,7 +200,7 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?attr/color_background_primary" + android:background="@android:color/transparent" android:text="Request to Speak" />