diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:43:36 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-20 22:43:36 +0200 |
| commit | 893a1a0958d4b9f6d3ba5f81ee29b9341fdc07c5 (patch) | |
| tree | e9d46e68456262390f486ca154c20fc5f685393b /src/main/res/layout | |
| parent | bceee45b463dc6113301ba82cb636ecd9e0c509c (diff) | |
| parent | 516da5145406af146ba267ce874a1c8d20059918 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/imageloader'
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 6 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 5 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 5 |
3 files changed, 9 insertions, 7 deletions
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" /> </RelativeLayout> 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" /> <TextView diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 8d3c0416c..2617c1212 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -47,9 +47,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" /> <TextView |