aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-06-10 23:22:16 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-06-10 23:22:16 +0200
commit5017e8564c7d0a215cfa8e9983851efd2b2994f3 (patch)
treef41a65060d0d600aa841aa89e93303d2a25055ba
parenta70f57358ed4f367787e39fa2ff3b235896f0107 (diff)
made background color of swiped conversations darker
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/conversation_list_row.xml2
-rw-r--r--src/main/res/values-v21/themes.xml4
-rw-r--r--src/main/res/values/attrs.xml2
-rw-r--r--src/main/res/values/themes.xml4
4 files changed, 11 insertions, 1 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cc705d3d..a53de741 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -7,7 +7,7 @@
<View
android:layout_width="fill_parent"
android:layout_height="match_parent"
- android:background="@color/primary500"/>
+ android:background="?attr/conversations_overview_background"/>
<FrameLayout
android:id="@+id/swipeable_item"
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 91a9c5e8..330bd610 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -33,6 +33,8 @@
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
<item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
+ <item name="attr/conversations_overview_background">@color/primary700</item>
+
<item name="attr/icon_alpha">0.54</item>
<item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
@@ -94,6 +96,8 @@
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
<item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
+ <item name="attr/conversations_overview_background">@color/primary900</item>
+
<item name="attr/icon_alpha">1.0</item>
<item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 175f3f2b..8062cd7e 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -23,6 +23,8 @@
<attr name="message_bubble_sent" format="reference"/>
<attr name="message_bubble_received_green" format="reference"/>
+ <attr name="conversations_overview_background" format="reference|color"/>
+
<attr name="icon_alpha" format="float"/>
<attr name="icon_add_group" format="reference"/>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 54e663a7..1b3a4098 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -39,6 +39,8 @@
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
<item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
+ <item name="attr/conversations_overview_background">@color/primary700</item>
+
<item name="attr/icon_alpha">1.0</item>
<item name="attr/icon_group">@drawable/ic_action_group</item>
@@ -87,6 +89,8 @@
<item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
<item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
+ <item name="attr/conversations_overview_background">@color/primary900</item>
+
<item name="attr/icon_alpha">1.0</item>
<item name="attr/icon_add_group">@drawable/ic_action_add_group</item>