From 516da5145406af146ba267ce874a1c8d20059918 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 20 May 2016 22:31:16 +0200 Subject: changed colors to standard from @color and add border to images --- src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 8 ++++---- src/main/res/layout/fragment_conversation.xml | 6 +++--- src/main/res/layout/message_received.xml | 5 +++-- src/main/res/layout/message_sent.xml | 5 +++-- 4 files changed, 13 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index e1f563e01..5d249d863 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -1175,8 +1175,8 @@ public abstract class XmppActivity extends Activity { Glide.with(this) .load(bm) .override(288, 288) - //.fitCenter() - .centerCrop() + .fitCenter() + //.centerCrop() .diskCacheStrategy(DiskCacheStrategy.RESULT) .into(imageView); //Log.d(Config.LOGTAG,"Load image with glide"); @@ -1192,8 +1192,8 @@ public abstract class XmppActivity extends Activity { .load(vp) .asBitmap() .override(288,288) - //.fitCenter() - .centerCrop() + .fitCenter() + //.centerCrop() .diskCacheStrategy(DiskCacheStrategy.RESULT) .videoDecoder(fileDescriptorBitmapDecoder) .into(imageView); diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 88f2cbb28..a66345e17 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -13,7 +13,7 @@ android:layout_above="@+id/snackbar" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:background="@color/background_floating_material_light" + android:background="@color/grey200" android:divider="@null" android:dividerHeight="0dp" android:listSelector="@android:color/transparent" @@ -30,7 +30,7 @@ android:layout_alignParentLeft="true" android:background="@color/grey200" android:clickable="true" - android:paddingTop="4dp" + android:paddingTop="2dp" android:paddingLeft="2dp" android:paddingBottom="2dp"> @@ -61,7 +61,7 @@ android:layout_height="48dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" + android:background="@color/grey200" android:src="@drawable/ic_send_text_offline" /> diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 77d560297..14aea096f 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -46,9 +46,10 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="4dp" - app:riv_corner_radius="5dp" android:adjustViewBounds="true" - android:background="@color/black87" + app:riv_border_width="1dp" + app:riv_border_color="@color/black12" + app:riv_corner_radius="5dp" android:scaleType="centerCrop" />