Merge pull request #1368 from mcginty/contact-select-header-dark

fix contact selection header theming
This commit is contained in:
Moxie Marlinspike 2014-04-24 18:47:13 -07:00
commit 02d3760b31
3 changed files with 5 additions and 2 deletions

View File

@ -14,12 +14,12 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:textSize="15sp" android:textSize="15sp"
android:textColor="?conversation_sent_text_secondary_color" android:textColor="?conversation_selection_header_text"
android:textStyle="bold" /> android:textStyle="bold" />
<View android:layout_width="match_parent" <View android:layout_width="match_parent"
android:layout_height="3dp" android:layout_height="3dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:background="?conversation_received_text_secondary_color" /> android:background="?conversation_selection_header_text" />
</RelativeLayout> </RelativeLayout>

View File

@ -49,6 +49,7 @@
<attr name="contact_selection_push_user" format="reference|color" /> <attr name="contact_selection_push_user" format="reference|color" />
<attr name="contact_selection_lay_user" format="reference|color" /> <attr name="contact_selection_lay_user" format="reference|color" />
<attr name="contact_selection_label_text" format="reference|color" /> <attr name="contact_selection_label_text" format="reference|color" />
<attr name="conversation_selection_header_text" format="reference|color" />
<attr name="navigation_drawer_background" format="reference|color"/> <attr name="navigation_drawer_background" format="reference|color"/>
<attr name="navigation_drawer_text_color" format="color"/> <attr name="navigation_drawer_text_color" format="color"/>

View File

@ -28,6 +28,7 @@
<item name="contact_selection_push_user">#ff000000</item> <item name="contact_selection_push_user">#ff000000</item>
<item name="contact_selection_lay_user">#a0000000</item> <item name="contact_selection_lay_user">#a0000000</item>
<item name="contact_selection_label_text">#66000000</item> <item name="contact_selection_label_text">#66000000</item>
<item name="conversation_selection_header_text">#44000000</item>
<item name="conversation_background">#ffdddddd</item> <item name="conversation_background">#ffdddddd</item>
<item name="conversation_editor_background">@drawable/textlines</item> <item name="conversation_editor_background">@drawable/textlines</item>
@ -100,6 +101,7 @@
<item name="contact_selection_push_user">#ffeeeeee</item> <item name="contact_selection_push_user">#ffeeeeee</item>
<item name="contact_selection_lay_user">#afeeeeee</item> <item name="contact_selection_lay_user">#afeeeeee</item>
<item name="contact_selection_label_text">#66eeeeee</item> <item name="contact_selection_label_text">#66eeeeee</item>
<item name="conversation_selection_header_text">#66eeeeee</item>
<item name="conversation_item_received_background">@drawable/conversation_item_received_shape_dark</item> <item name="conversation_item_received_background">@drawable/conversation_item_received_shape_dark</item>
<item name="conversation_item_received_triangle_background">@drawable/conversation_item_received_triangle_shape_dark</item> <item name="conversation_item_received_triangle_background">@drawable/conversation_item_received_triangle_shape_dark</item>