From d5b9aec39f923df0d5c2bf71054be3406a333e29 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sun, 16 Sep 2012 03:24:40 +0200
Subject: [PATCH] Display a dark-themed "Send as" dialog when using the dark
 theme on HC+

---
 res/layout/choose_account_item.xml           | 2 +-
 res/values-v11/themes.xml                    | 6 +++++-
 res/values/attrs.xml                         | 1 +
 res/values/themes.xml                        | 9 ++++++++-
 src/com/fsck/k9/activity/MessageCompose.java | 4 +++-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/res/layout/choose_account_item.xml b/res/layout/choose_account_item.xml
index 910312441..5bcf7a58d 100644
--- a/res/layout/choose_account_item.xml
+++ b/res/layout/choose_account_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="#cccccc"
+    android:background="?attr/backgroundColorChooseAccountHeader"
     android:gravity="left|center_vertical">
     <View
         android:id="@+id/chip"
diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml
index 1d23ec041..ac591f45d 100644
--- a/res/values-v11/themes.xml
+++ b/res/values-v11/themes.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- We need to override the dark theme to *not* use the workarounds of Theme.K9.Dark in
          res/values/ -->
     <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
     </style>
 
+    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
+        <item name="backgroundColorChooseAccountHeader">#404040</item>
+    </style>
+
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2d4ff70d9..300bd1b03 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -41,6 +41,7 @@
         <attr name="iconMenuShowFolders" format="reference" />
         <attr name="textColorPrimaryRecipientDropdown" format="reference" />
         <attr name="textColorSecondaryRecipientDropdown" format="reference" />
+        <attr name="backgroundColorChooseAccountHeader" format="color" />
     </declare-styleable>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0d13eddd0..3453fd668 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="Theme.K9.Light.Base" parent="Theme.Sherlock.Light">
         <item name="iconFolder">@drawable/folder_light</item>
@@ -95,4 +95,11 @@
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
     </style>
 
+    <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
+        <item name="backgroundColorChooseAccountHeader">#cccccc</item>
+    </style>
+
+    <!-- Prior to Honeycomb we always use the light theme for dialogs -->
+    <style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dialog.Light" />
+
 </resources>
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 125899b15..d7862a833 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -2328,7 +2328,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
             .create();
         case DIALOG_CHOOSE_IDENTITY:
             Context context = new ContextThemeWrapper(this,
-                    K9.getK9ThemeResourceId(K9.THEME_LIGHT));
+                    (K9.getK9Theme() == K9.THEME_LIGHT) ?
+                            R.style.Theme_K9_Dialog_Light :
+                            R.style.Theme_K9_Dialog_Dark);
             Builder builder = new AlertDialog.Builder(context);
             builder.setTitle(R.string.send_as);
             final IdentityAdapter adapter = new IdentityAdapter(context);