Merge branch 'Wanztwurst-darkTheme' fixes #529

1 files changed, 102 insertions, 2 deletions

diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 424db4c9..8256f28a 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -9,17 +9,37 @@
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
+        <item name="attr/color_text_primary">@color/black87</item>
+        <item name="attr/color_text_secondary">@color/black54</item>
+
+        <item name="attr/color_background_primary">@color/grey50</item>
+        <item name="attr/color_background_secondary">@color/grey200</item>
+
+        <item name="attr/infocard_border">@drawable/infocard_border</item>
+        <item name="attr/divider">@color/black12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline</item>
+
         <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
         <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
         <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
-        <item name="attr/icon_chat">@drawable/ic_action_chat</item>
         <item name="attr/icon_copy">@drawable/ic_action_copy</item>
         <item name="attr/icon_discard">@drawable/ic_action_discard</item>
         <item name="attr/icon_download">@drawable/ic_action_download</item>
         <item name="attr/icon_edit">@drawable/ic_action_edit</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+        <item name="attr/icon_edit_body">@drawable/ic_action_edit_dark</item>
         <item name="attr/icon_done">@drawable/ic_action_done</item>
 
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+
+        <item name="attr/icon_alpha">1.0</item>
+
         <item name="attr/icon_group">@drawable/ic_action_group</item>
         <item name="attr/icon_new">@drawable/ic_action_new</item>
         <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
@@ -31,6 +51,68 @@
         <item name="attr/icon_settings">@drawable/ic_action_settings</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
         <item name="attr/icon_share">@drawable/ic_action_share</item>
+
+        <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black54_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black54_24dp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/ConversationsActionBar.Dark</item>
+        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget.Dark</item>
+        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/color_text_primary">@color/white</item>
+        <item name="attr/color_text_secondary">@color/white70</item>
+
+        <item name="attr/color_background_primary">@color/grey800</item>
+        <item name="attr/color_background_secondary">@color/grey900</item>
+
+        <item name="attr/infocard_border">@drawable/infocard_border_dark</item>
+        <item name="attr/divider">@color/white12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline_white</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
+
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+
+        <item name="attr/icon_alpha">1.0</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
+        <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
+        <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
+        <item name="attr/icon_copy">@drawable/ic_action_copy_white</item>
+        <item name="attr/icon_discard">@drawable/ic_action_discard</item>
+        <item name="attr/icon_download">@drawable/ic_action_download</item>
+        <item name="attr/icon_edit">@drawable/ic_action_edit</item>
+        <item name="attr/icon_edit_body">@drawable/ic_action_edit</item>
+        <item name="attr/icon_done">@drawable/ic_action_done</item>
+
+        <item name="attr/icon_group">@drawable/ic_action_group</item>
+        <item name="attr/icon_new">@drawable/ic_action_new</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
+        <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_refresh">@drawable/ic_action_refresh_white</item>
+        <item name="attr/icon_remove">@drawable/ic_action_remove_white</item>
+        <item name="attr/icon_search">@drawable/ic_action_search</item>
+        <item name="attr/icon_secure">@drawable/ic_action_secure</item>
+        <item name="attr/icon_settings">@drawable/ic_action_settings_white</item>
+        <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
+        <item name="attr/icon_share">@drawable/ic_action_share</item>
+
+        <item name="attr/icon_notifications">@drawable/ic_notifications_white80</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white80</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_white80</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_white80</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
@@ -39,6 +121,12 @@
         <item name="TextSizeHeadline">22sp</item>
     </style>
 
+    <style name="ConversationsTheme.Dark.LargerText" parent="ConversationsTheme.Dark">
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
         <item name="android:background">@color/primary</item>
         <item name="android:backgroundStacked">@color/primary_dark</item>
@@ -46,11 +134,23 @@
         <item name="android:icon">@android:color/transparent</item>
     </style>
 
+    <style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid">
+        <item name="android:background">@color/primary</item>
+        <item name="android:backgroundStacked">@color/primary_dark</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <item name="android:icon">@android:color/transparent</item>
+    </style>
+
     <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
         <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
         <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
     </style>
 
+    <style name="ConversationsActionBarWidget.Dark" parent="android:Theme.Holo">
+        <item name="android:popupMenuStyle">@android:style/Widget.Holo.PopupMenu</item>
+        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
+    </style>
+
     <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
         <item name="android:background">@drawable/actionbar_tab_indicator</item>
     </style>