moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Set background color of message view in one place

Browse Source
This commit is contained in:
cketti 2015-02-17 04:15:10 +01:00
parent e15cda8504
commit f887348953
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
View File

@ -517,7 +517,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
View v = LayoutInflater.from(mThemeContext).inflate(R.layout.message_compose, null);
TypedValue outValue = new TypedValue();
// background color needs to be forced
mThemeContext.getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
mThemeContext.getTheme().resolveAttribute(R.attr.messageViewBackgroundColor, outValue, true);
v.setBackgroundColor(outValue.data);
setContentView(v);
} else {

8
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
View File

@ -10,7 +10,6 @@ import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
@ -114,13 +113,6 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
openPgpHeaderView = (OpenPgpHeaderView) openPgpHeaderStub.inflate();
}
// the HTC version of WebView tries to force the background of the
// titlebar, which is really unfair.
TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
// also set background of the whole view (including the attachments view)
setBackgroundColor(outValue.data);
mShowHiddenAttachments.setOnClickListener(this);
mClipboardManager = ClipboardManager.getInstance(context);

5
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.java
View File

@ -7,7 +7,6 @@ import android.app.Fragment;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
@ -54,10 +53,6 @@ public class MessageTopView extends LinearLayout implements ShowPicturesControll
// mHeaderContainer.setOnLayoutChangedListener(this);
mInflater = ((MessageViewFragment) fragment).getFragmentLayoutInflater();
TypedValue outValue = new TypedValue();
getContext().getTheme().resolveAttribute(R.attr.messageViewHeaderBackgroundColor, outValue, true);
mHeaderContainer.setBackgroundColor(outValue.data);
mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
mDownloadRemainder.setVisibility(View.GONE);

3
k9mail/src/main/res/layout/message.xml
View File

@ -6,7 +6,8 @@
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1">
android:layout_weight="1"
android:background="?attr/messageViewBackgroundColor">
<com.fsck.k9.view.NonLockingScrollView
android:layout_width="fill_parent"

2
k9mail/src/main/res/values/attrs.xml
View File

@ -48,7 +48,7 @@
<attr name="messageListActiveItemBackgroundColor" format="reference|color"/>
<attr name="messageListDividerColor" format="reference|color"/>
<attr name="messageListCheckbox" format="reference"/>
<attr name="messageViewHeaderBackgroundColor" format="reference|color"/>
<attr name="messageViewBackgroundColor" format="reference|color"/>
<attr name="messageViewAttachmentBackground" format="reference"/>
<attr name="messageComposeAddContactImage" format="reference"/>
<attr name="composerBackgroundColor" format="color"/>

4
k9mail/src/main/res/values/themes.xml
View File

@ -51,7 +51,7 @@
<item name="messageListActiveItemBackgroundColor">#ff2ea7d1</item>
<item name="messageListDividerColor">#ffcccccc</item>
<item name="messageListCheckbox">@drawable/btn_check_message_list_light</item>
<item name="messageViewHeaderBackgroundColor">#ffffffff</item>
<item name="messageViewBackgroundColor">#ffffffff</item>
<item name="messageViewAttachmentBackground">@drawable/attachment_text_box_light</item>
<item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_light</item>
<item name="compatDividerVertical">?attr/messageListDividerColor</item>
@ -105,7 +105,7 @@
<item name="messageListActiveItemBackgroundColor">#ff33b5e5</item>
<item name="messageListDividerColor">#ff333333</item>
<item name="messageListCheckbox">@drawable/btn_check_message_list_dark</item>
<item name="messageViewHeaderBackgroundColor">#000000</item>
<item name="messageViewBackgroundColor">#000000</item>
<item name="messageViewAttachmentBackground">@drawable/attachment_text_box_dark</item>
<item name="messageComposeAddContactImage">@drawable/ic_button_add_contact_dark</item>
<item name="compatDividerVertical">?attr/messageListDividerColor</item>