moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-25 07:01:50 -05:00
Code Issues Releases Wiki Activity

Display a dark-themed "Send as" dialog when using the dark theme on HC+

Browse Source
This commit is contained in:
cketti 2012-09-16 03:24:40 +02:00
parent 163557ae8a
commit d5b9aec39f
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/choose_account_item.xml
View File

@ -4,7 +4,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:background="#cccccc" android:background="?attr/backgroundColorChooseAccountHeader"
android:gravity="left|center_vertical"> android:gravity="left|center_vertical">
<View <View
android:id="@+id/chip" android:id="@+id/chip"

6
res/values-v11/themes.xml
View File

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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 <!-- We need to override the dark theme to *not* use the workarounds of Theme.K9.Dark in
res/values/ --> res/values/ -->
<style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base"> <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
</style> </style>
<style name="Theme.K9.Dialog.Dark" parent="Theme.K9.Dark">
<item name="backgroundColorChooseAccountHeader">#404040</item>
</style>
</resources> </resources>

1
res/values/attrs.xml
View File

@ -41,6 +41,7 @@
<attr name="iconMenuShowFolders" format="reference" /> <attr name="iconMenuShowFolders" format="reference" />
<attr name="textColorPrimaryRecipientDropdown" format="reference" /> <attr name="textColorPrimaryRecipientDropdown" format="reference" />
<attr name="textColorSecondaryRecipientDropdown" format="reference" /> <attr name="textColorSecondaryRecipientDropdown" format="reference" />
<attr name="backgroundColorChooseAccountHeader" format="color" />
</declare-styleable> </declare-styleable>
</resources> </resources>

9
res/values/themes.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <style name="Theme.K9.Light.Base" parent="Theme.Sherlock.Light">
<item name="iconFolder">@drawable/folder_light</item> <item name="iconFolder">@drawable/folder_light</item>
@ -95,4 +95,11 @@
<item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item> <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
</style> </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> </resources>

4
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -2328,7 +2328,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
.create(); .create();
case DIALOG_CHOOSE_IDENTITY: case DIALOG_CHOOSE_IDENTITY:
Context context = new ContextThemeWrapper(this, 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 builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.send_as); builder.setTitle(R.string.send_as);
final IdentityAdapter adapter = new IdentityAdapter(context); final IdentityAdapter adapter = new IdentityAdapter(context);