Dark theme, theme switch, icons, style, strings

added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc

purged ic_action_chat as it wasn't used

preference use_white_background changed to use_green_background, default true

grey chat bubbles darker, text white

replaced all grey600 with black icons and 0.54 alpha attribute

highlightColor in dark grey chat bubble now darker than background

5 files changed, 144 insertions, 5 deletions

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 48dbaabf..0695d1cd 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -8,6 +8,14 @@
 		<item>@string/app_name</item>
 		<item>Android</item>
 	</string-array>
+	<string-array name="themes">
+		<item>@string/pref_theme_light</item>
+		<item>@string/pref_theme_dark</item>
+	</string-array>
+	<string-array name="themes_values">
+		<item>light</item>
+		<item>dark</item>
+	</string-array>
 	<string-array name="filesizes">
 		<item>@string/never</item>
 		<item>256 KiB</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 901ea754..a0d962d4 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,15 +5,33 @@
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
 
+    <attr name="color_text_primary" format="reference|color" />
+    <attr name="color_text_secondary" format="reference|color" />
+
+    <attr name="color_background_secondary" format="reference|color" />
+    <attr name="color_background_primary" format="reference|color" />
+
+    <attr name="infocard_border" format="reference"/>
+    <attr name="ic_send_cancel_offline" format="reference"/>
+    <attr name="ic_send_location_offline" format="reference"/>
+    <attr name="ic_send_photo_offline" format="reference"/>
+    <attr name="ic_send_picture_offline" format="reference"/>
+    <attr name="ic_send_text_offline" format="reference"/>
+    <attr name="ic_send_voice_offline" format="reference"/>
+
+    <attr name="message_bubble_received_monochrome" format="reference"/>
+    <attr name="message_bubble_sent" format="reference"/>
+
+    <attr name="icon_alpha" format="float"/>
+
     <attr name="icon_add_group" format="reference"/>
     <attr name="icon_add_person" format="reference"/>
     <attr name="icon_cancel" format="reference"/>
-    <attr name="icon_chat" format="reference"/>
     <attr name="icon_copy" format="reference"/>
     <attr name="icon_discard" format="reference"/>
     <attr name="icon_download" format="reference"/>
     <attr name="icon_edit" format="reference"/>
-    <attr name="icon_edit_dark" format="reference"/>
+    <attr name="icon_edit_body" format="reference"/>
     <attr name="icon_done" format="reference"/>
     <attr name="icon_group" format="reference"/>
     <attr name="icon_new" format="reference"/>
@@ -27,4 +45,9 @@
     <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
 
+    <attr name="icon_notifications" format="reference"/>
+    <attr name="icon_notifications_off" format="reference"/>
+    <attr name="icon_notifications_paused" format="reference"/>
+    <attr name="icon_notifications_none" format="reference"/>
+
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index b3567b44..25b1d3b7 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -9,10 +9,12 @@
 	<color name="black12">#1f000000</color>
 	<color name="white">#ffffffff</color>
 	<color name="white70">#b2ffffff</color>
+	<color name="white12">#1fffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
 	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
+	<color name="grey900">#ff282828</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dee7502f..6d03b20f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -412,7 +412,7 @@
 	<string name="enable_notifications">Enable notifications</string>
 	<string name="conference_with">Create conference with…</string>
 	<string name="no_conference_server_found">No conference server found</string>
-	<string name="conference_creation_failed">Conference creation failed!</string>s
+	<string name="conference_creation_failed">Conference creation failed!</string>
 	<string name="secret_accepted">Secret accepted!</string>
 	<string name="reset">Reset</string>
 	<string name="account_image_description">Account avatar</string>
@@ -656,4 +656,10 @@
 	<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
 	<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Conversations</string>
 	<string name="pref_privacy">Privacy</string>
+	<string name="pref_theme_options">Theme</string>
+	<string name="pref_theme_options_summary">Select the color palette</string>
+	<string name="pref_theme_light">Light theme</string>
+	<string name="pref_theme_dark">Dark theme</string>
+	<string name="pref_use_green_background">Green Background</string>
+	<string name="pref_use_green_background_summary">Use green background for received messages</string>
 </resources>
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>