filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mistake on call buttons

This commit is contained in:
Benoit Marty 2021-06-16 16:34:03 +02:00
parent 71b456c57e
commit f313fbe88c
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/CallTileTimelineItem.kt
View File

@ -69,7 +69,7 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
holder.acceptView.onClick { holder.acceptView.onClick {
attributes.callback?.onTimelineItemAction(RoomDetailAction.AcceptCall(callId = attributes.callId)) attributes.callback?.onTimelineItemAction(RoomDetailAction.AcceptCall(callId = attributes.callId))
} }
holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorError) holder.rejectView.setLeftDrawable(R.drawable.ic_call_hangup, R.attr.colorOnPrimary)
holder.rejectView.onClick { holder.rejectView.onClick {
attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall) attributes.callback?.onTimelineItemAction(RoomDetailAction.EndCall)
} }
@ -78,17 +78,17 @@ abstract class CallTileTimelineItem : AbsBaseMessageItem<CallTileTimelineItem.Ho
CallKind.CONFERENCE -> { CallKind.CONFERENCE -> {
holder.rejectView.setText(R.string.ignore) holder.rejectView.setText(R.string.ignore)
holder.acceptView.setText(R.string.join) holder.acceptView.setText(R.string.join)
holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary) holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
} }
CallKind.AUDIO -> { CallKind.AUDIO -> {
holder.rejectView.setText(R.string.call_notification_reject) holder.rejectView.setText(R.string.call_notification_reject)
holder.acceptView.setText(R.string.call_notification_answer) holder.acceptView.setText(R.string.call_notification_answer)
holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorPrimary) holder.acceptView.setLeftDrawable(R.drawable.ic_call_audio_small, R.attr.colorOnPrimary)
} }
CallKind.VIDEO -> { CallKind.VIDEO -> {
holder.rejectView.setText(R.string.call_notification_reject) holder.rejectView.setText(R.string.call_notification_reject)
holder.acceptView.setText(R.string.call_notification_answer) holder.acceptView.setText(R.string.call_notification_answer)
holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorPrimary) holder.acceptView.setLeftDrawable(R.drawable.ic_call_video_small, R.attr.colorOnPrimary)
} }
else -> { else -> {
Timber.w("Shouldn't be in that state") Timber.w("Shouldn't be in that state")

8
vector/src/main/res/layout/alerter_incoming_call_layout.xml
View File

@ -67,7 +67,9 @@
android:src="@drawable/ic_call_answer" android:src="@drawable/ic_call_answer"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnPrimary"
tools:ignore="MissingPrefix" />
<ImageView <ImageView
android:id="@+id/incomingCallRejectView" android:id="@+id/incomingCallRejectView"
@ -83,6 +85,8 @@
android:src="@drawable/ic_call_hangup" android:src="@drawable/ic_call_hangup"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/incomingCallAcceptView" app:layout_constraintEnd_toStartOf="@id/incomingCallAcceptView"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:tint="?colorOnPrimary"
tools:ignore="MissingPrefix" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

3
vector/src/main/res/layout/view_call_controls.xml
View File

@ -25,6 +25,7 @@
android:focusable="true" android:focusable="true"
android:padding="12dp" android:padding="12dp"
android:src="@drawable/ic_call_answer" android:src="@drawable/ic_call_answer"
app:tint="?colorOnPrimary"
tools:ignore="MissingConstraints,MissingPrefix" /> tools:ignore="MissingConstraints,MissingPrefix" />
<ImageView <ImageView
@ -38,6 +39,7 @@
android:focusable="true" android:focusable="true"
android:padding="12dp" android:padding="12dp"
android:src="@drawable/ic_call_hangup" android:src="@drawable/ic_call_hangup"
app:tint="?colorOnPrimary"
tools:ignore="MissingConstraints,MissingPrefix" /> tools:ignore="MissingConstraints,MissingPrefix" />
<androidx.constraintlayout.helper.widget.Flow <androidx.constraintlayout.helper.widget.Flow
@ -100,6 +102,7 @@
android:focusable="true" android:focusable="true"
android:padding="12dp" android:padding="12dp"
android:src="@drawable/ic_call_hangup" android:src="@drawable/ic_call_hangup"
app:tint="?colorOnPrimary"
tools:ignore="MissingConstraints,MissingPrefix" /> tools:ignore="MissingConstraints,MissingPrefix" />
<ImageView <ImageView