From 325d7935406424ffa8d5762eb7ebc2a828de983f Mon Sep 17 00:00:00 2001 From: Julius Linus Date: Tue, 3 Oct 2023 10:58:15 -0500 Subject: [PATCH 1/3] Bugfix for accept call button Signed-off-by: rapterjet2004 --- .../talk/adapters/messages/CallStartedViewHolder.kt | 2 +- app/src/main/res/layout/call_started_message.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt index e0c4cbcc2f..c6154ddaa1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/CallStartedViewHolder.kt @@ -82,7 +82,7 @@ class CallStartedViewHolder(incomingView: View, payload: Any) : true ) } else { - ApiUtils.getUrlForAvatar(user!!.baseUrl, message.actorDisplayName, true) + ApiUtils.getUrlForAvatar(user!!.baseUrl, message.actorDisplayName, false) } val imageRequest: ImageRequest = ImageRequest.Builder(context) diff --git a/app/src/main/res/layout/call_started_message.xml b/app/src/main/res/layout/call_started_message.xml index 72ce73bfdc..973714a401 100644 --- a/app/src/main/res/layout/call_started_message.xml +++ b/app/src/main/res/layout/call_started_message.xml @@ -41,9 +41,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/standard_quarter_margin" - app:chipIcon="@drawable/accent_circle" + app:chipIcon="@drawable/account_circle_48dp" app:chipCornerRadius="@dimen/dialogBorderRadius" - tools:text="Jessica Fox" /> + tools:text="Julius James Linus" /> Date: Tue, 3 Oct 2023 10:58:15 -0500 Subject: [PATCH 2/3] Bugfix for accept call button Signed-off-by: Julius Linus Signed-off-by: rapterjet2004 --- app/src/main/res/layout/call_started_message.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/call_started_message.xml b/app/src/main/res/layout/call_started_message.xml index 973714a401..bb4239412a 100644 --- a/app/src/main/res/layout/call_started_message.xml +++ b/app/src/main/res/layout/call_started_message.xml @@ -24,7 +24,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/standard_double_margin" + android:layout_marginHorizontal="@dimen/standard_margin" android:padding="@dimen/standard_padding" tools:background="@drawable/shape_grouped_outcoming_message" tools:backgroundTint="@color/colorPrimaryDark"> From eea7c70557af176d83e9ac2061cb194384b5916d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 4 Oct 2023 11:14:50 +0200 Subject: [PATCH 3/3] raise contrast for call buttons, optimize paddings/margins Signed-off-by: Andy Scherzinger --- app/src/main/res/layout/call_started_message.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/call_started_message.xml b/app/src/main/res/layout/call_started_message.xml index bb4239412a..b80e82f966 100644 --- a/app/src/main/res/layout/call_started_message.xml +++ b/app/src/main/res/layout/call_started_message.xml @@ -32,7 +32,7 @@ @@ -65,10 +65,9 @@ android:backgroundTint="@color/nc_darkGreen" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/standard_margin" + android:layout_marginEnd="@dimen/standard_margin" app:icon="@drawable/ic_videocam_grey_600_24dp" app:iconTint="@color/white" - android:alpha="0.8" android:textColor="@color/white" android:text="@string/video_call" /> @@ -78,8 +77,6 @@ android:backgroundTint="@color/nc_darkGreen" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/standard_margin" - android:alpha="0.8" app:icon="@drawable/ic_phone" app:iconTint="@color/white" android:text="@string/audio_call"