Skip to content

Commit

Permalink
Merge pull request #3357 from nextcloud/bug_fix_accept_call_button_re…
Browse files Browse the repository at this point in the history
…formating

Bug fix for accept call message
  • Loading branch information
AndyScherzinger authored Oct 4, 2023
2 parents 2511b54 + eea7c70 commit 86e4d31
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 5 additions & 8 deletions app/src/main/res/layout/call_started_message.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
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">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_margin"
android:orientation="horizontal"
android:gravity="center">

Expand All @@ -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" />

<TextView
android:layout_width="wrap_content"
Expand All @@ -65,10 +65,9 @@
android:backgroundTint="@color/nc_darkGreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_half_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" />

Expand All @@ -78,8 +77,6 @@
android:backgroundTint="@color/nc_darkGreen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_half_margin"
android:alpha="0.8"
app:icon="@drawable/ic_phone"
app:iconTint="@color/white"
android:text="@string/audio_call"
Expand Down

0 comments on commit 86e4d31

Please sign in to comment.