From a74d57cb71d67e42e1db709e00d5fd514b1ecd0c Mon Sep 17 00:00:00 2001
From: m0viefreak <m0viefreak.cm@googlemail.com>
Date: Mon, 4 Feb 2013 18:04:34 +0100
Subject: [PATCH] MessageView: Theme fix when global and message view theme
 differ

- Since the split-view change, MessageView is only a fragment, so we
  can't call setTheme() anymore so easily.
  Instead, use a ContextThemeWrapper and use that to inflate the
  layout. This way the message header and attachment view
  are styled correctly.

- The HTC WebView fix in SingleMessageView was returning the wrong
  background color, when message view theme and global theme differ,
  because it always used the global theme to retrieve it.
  Fix: Specifically put the light/dark values in the themes.xml,
  and get them using getContext().getTheme().resolveAttribute().
  getContext() will use the ContextThemeWrapper from above, so
  even if the global and message view themes differ, it aleays
  returns the correct one.
  The getThemeBackgroundColor() method added to the K9ActivityMagic
  interface in 309eeb72ac3c4fb2b93766550eed24e5cab39bb8 is now not
  needed anymore, and was removed.
---
 res/values/attrs.xml                              | 1 +
 res/values/themes.xml                             | 2 ++
 src/com/fsck/k9/activity/K9Activity.java          | 5 -----
 src/com/fsck/k9/activity/K9ActivityCommon.java    | 1 -
 src/com/fsck/k9/activity/K9FragmentActivity.java  | 5 -----
 src/com/fsck/k9/activity/K9ListActivity.java      | 5 -----
 src/com/fsck/k9/fragment/MessageViewFragment.java | 7 +++++--
 src/com/fsck/k9/view/SingleMessageView.java       | 7 +++++--
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 36f205af5..dc0ba11c6 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -50,6 +50,7 @@
         <attr name="messageListThreadCountBackground" format="reference|color"/>
         <attr name="messageListActiveItemBackgroundColor" format="reference|color"/>
         <attr name="messageListDividerColor" format="reference|color"/>
+        <attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
 
     </declare-styleable>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f39ed8140..1ebaaa9fa 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -49,6 +49,7 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>
         <item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
         <item name="messageListDividerColor">#ffcccccc</item>
+        <item name="messageViewHeaderBackgroundColor">#ffffffff</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -100,6 +101,7 @@
         <item name="messageListThreadCountBackground">@drawable/thread_count_box_dark</item>
         <item name="messageListActiveItemBackgroundColor">#ff33b5e5</item>
         <item name="messageListDividerColor">#ff333333</item>
+        <item name="messageViewHeaderBackgroundColor">#000000</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
diff --git a/src/com/fsck/k9/activity/K9Activity.java b/src/com/fsck/k9/activity/K9Activity.java
index c1b35ce79..64083758d 100644
--- a/src/com/fsck/k9/activity/K9Activity.java
+++ b/src/com/fsck/k9/activity/K9Activity.java
@@ -25,11 +25,6 @@ public class K9Activity extends SherlockActivity implements K9ActivityMagic {
         return super.dispatchTouchEvent(event);
     }
 
-    @Override
-    public int getThemeBackgroundColor() {
-        return mBase.getThemeBackgroundColor();
-    }
-
     @Override
     public void setupGestureDetector(OnSwipeGestureListener listener) {
         mBase.setupGestureDetector(listener);
diff --git a/src/com/fsck/k9/activity/K9ActivityCommon.java b/src/com/fsck/k9/activity/K9ActivityCommon.java
index 251ef02b7..e891911ad 100644
--- a/src/com/fsck/k9/activity/K9ActivityCommon.java
+++ b/src/com/fsck/k9/activity/K9ActivityCommon.java
@@ -62,7 +62,6 @@ public class K9ActivityCommon {
      * in {@link K9ActivityCommon}.</p>
      */
     public interface K9ActivityMagic {
-        int getThemeBackgroundColor();
         void setupGestureDetector(OnSwipeGestureListener listener);
     }
 
diff --git a/src/com/fsck/k9/activity/K9FragmentActivity.java b/src/com/fsck/k9/activity/K9FragmentActivity.java
index 289765b0c..6adf35f9b 100644
--- a/src/com/fsck/k9/activity/K9FragmentActivity.java
+++ b/src/com/fsck/k9/activity/K9FragmentActivity.java
@@ -25,11 +25,6 @@ public class K9FragmentActivity extends SherlockFragmentActivity implements K9Ac
         return super.dispatchTouchEvent(event);
     }
 
-    @Override
-    public int getThemeBackgroundColor() {
-        return mBase.getThemeBackgroundColor();
-    }
-
     @Override
     public void setupGestureDetector(OnSwipeGestureListener listener) {
         mBase.setupGestureDetector(listener);
diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/src/com/fsck/k9/activity/K9ListActivity.java
index 9c37a58e6..119b53be2 100644
--- a/src/com/fsck/k9/activity/K9ListActivity.java
+++ b/src/com/fsck/k9/activity/K9ListActivity.java
@@ -54,11 +54,6 @@ public class K9ListActivity extends SherlockListActivity implements K9ActivityMa
         mDateFormat = DateFormatter.getDateFormat(this);
     }
 
-    @Override
-    public int getThemeBackgroundColor() {
-        return mBase.getThemeBackgroundColor();
-    }
-
     @Override
     public void setupGestureDetector(OnSwipeGestureListener listener) {
         mBase.setupGestureDetector(listener);
diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/src/com/fsck/k9/fragment/MessageViewFragment.java
index b702e169c..4ecbe0585 100644
--- a/src/com/fsck/k9/fragment/MessageViewFragment.java
+++ b/src/com/fsck/k9/fragment/MessageViewFragment.java
@@ -12,6 +12,7 @@ import android.os.Handler;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
 import android.util.Log;
+import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -169,8 +170,10 @@ public class MessageViewFragment extends SherlockFragment implements OnClickList
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-
-        View view = inflater.inflate(R.layout.message, container, false);
+        Context context = new ContextThemeWrapper(getActivity().getApplicationContext(),
+                K9.getK9ThemeResourceId(K9.getK9MessageViewTheme()));
+        LayoutInflater localInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = localInflater.inflate(R.layout.message, container, false);
 
 
         mMessageView = (SingleMessageView) view.findViewById(R.id.message_view);
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 5f0f208c8..7d2948499 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -1,5 +1,6 @@
 package com.fsck.k9.view;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -14,6 +15,7 @@ import android.os.Parcelable;
 import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -32,7 +34,6 @@ import android.widget.Toast;
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.R;
-import com.fsck.k9.activity.K9ActivityCommon.K9ActivityMagic;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.crypto.CryptoProvider;
@@ -159,7 +160,9 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
             mHeaderPlaceHolder.removeView(mHeaderContainer);
             // the HTC version of WebView tries to force the background of the
             // titlebar, which is really unfair.
-            mHeaderContainer.setBackgroundColor(((K9ActivityMagic)activity).getThemeBackgroundColor());
+            TypedValue outValue = new TypedValue();
+            getContext().getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
+            mHeaderContainer.setBackgroundColor(outValue.data);
 
             mTitleBarHeaderContainer = new LinearLayout(activity);
             mMessageContentView.setEmbeddedTitleBarCompat(mTitleBarHeaderContainer);