aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-11-14 17:38:24 +0100
committerChristian S <christian@pix-art.de>2015-11-14 17:52:03 +0100
commit5c9740fe188075f1023cc029a2d82be13f28b40e (patch)
tree3f41535e0ad2861ad68f77bfbd228dcb50a56cd8 /src/main
parent811ae879c481323ce7157b161ccebf7b7ef9a0bc (diff)
changed message background to light yellow
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/layout/fragment_conversation.xml8
-rw-r--r--src/main/res/values/colors.xml1
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f9..77bfad83e 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200" >
+ android:background="@color/lightyellow"
+ android:clickable="false">
<ListView
android:id="@+id/messages_view"
@@ -12,7 +13,7 @@
android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
- android:background="@color/grey200"
+ android:background="@color/lightyellow"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
@@ -27,7 +28,8 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:background="@color/grey50" >
+ android:background="@color/grey50"
+ android:clickable="true">
<eu.siacs.conversations.ui.EditMessage
android:id="@+id/textinput"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index b3567b44c..35f72d9aa 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
<color name="white">#ffffffff</color>
<color name="white70">#b2ffffff</color>
<color name="grey50">#fffafafa</color>
+ <color name="lightyellow">#ffF7F2E0</color>
<color name="grey200">#ffeeeeee</color>
<color name="grey500">#ff9e9e9e</color>
<color name="grey800">#ff424242</color>