diff --git a/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java b/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java index c1423d5bc..b237ed351 100644 --- a/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java +++ b/app/src/main/java/org/linphone/chat/ChatEventsAdapter.java @@ -359,6 +359,9 @@ public class ChatEventsAdapter extends SelectableAdapter { holder.bubbleLayout.setLayoutParams(layoutParams); } else { // Event is not chat message holder.eventLayout.setVisibility(View.VISIBLE); + holder.eventMessage.setTextColor(mContext.getResources().getColor(R.color.colorE)); + holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray); + holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_gray); Address address = event.getParticipantAddress(); String displayName = null; @@ -400,6 +403,10 @@ public class ChatEventsAdapter extends SelectableAdapter { holder.eventMessage.setText(mContext.getString(R.string.device_removed).replace("%s", displayName)); break; case ConferenceSecurityEvent: + holder.eventMessage.setTextColor(mContext.getResources().getColor(R.color.colorI)); + holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red); + holder.eventLayout.setBackgroundResource(R.drawable.event_decoration_red); + switch (event.getSecurityEventType()) { case LimeIdentityKeyChanged: holder.eventMessage.setText(mContext.getString(R.string.lime_identity_key_changed).replace("%s", displayName)); diff --git a/app/src/main/res/drawable-xhdpi/event_gray.png b/app/src/main/res/drawable-xhdpi/event_gray.png deleted file mode 100644 index 3c1ba6e96..000000000 Binary files a/app/src/main/res/drawable-xhdpi/event_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/event_decoration_gray.xml b/app/src/main/res/drawable/event_decoration_gray.xml new file mode 100644 index 000000000..e037f8225 --- /dev/null +++ b/app/src/main/res/drawable/event_decoration_gray.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/event_decoration_red.xml b/app/src/main/res/drawable/event_decoration_red.xml new file mode 100644 index 000000000..839e8ff17 --- /dev/null +++ b/app/src/main/res/drawable/event_decoration_red.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml index bdb4a217e..538c2bcb0 100644 --- a/app/src/main/res/layout-land/call.xml +++ b/app/src/main/res/layout-land/call.xml @@ -2,6 +2,7 @@ diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml index a47d108a1..263154b8d 100644 --- a/app/src/main/res/layout/call.xml +++ b/app/src/main/res/layout/call.xml @@ -2,6 +2,7 @@ diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml index 015bf3a97..c045f5d03 100644 --- a/app/src/main/res/layout/chat_bubble.xml +++ b/app/src/main/res/layout/chat_bubble.xml @@ -1,7 +1,7 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content"> - + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp" + android:gravity="center" + android:background="@drawable/event_decoration_gray"> - + - + - - - - - - + - + - + - + - + - + - + - + - - + -