moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring: Some variable, method, and id renaming.

This commit is contained in:
cketti 2010-10-09 00:38:52 +00:00
parent 7028a4c167
commit da7210d1db
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/global_preferences.xml
View File

@ -127,7 +127,7 @@
android:summary="@string/global_settings_show_contact_name_summary" />
<CheckBoxPreference
android:key="change_registered_name_color"
android:key="messagelist_contact_name_color"
android:title="@string/global_settings_registered_name_color_label"
android:summary="@string/global_settings_registered_name_color_default"
android:dependency="messagelist_show_contact_name" />

28
src/com/fsck/k9/K9.java
View File

@ -142,8 +142,8 @@ public class K9 extends Application
private static boolean mMessageListTouchable = false;
private static boolean mShowContactName = false;
private static boolean mChangeRegisteredNameColor = false;
private static int mRegisteredNameColor = 0xff00008f;
private static boolean mChangeContactNameColor = false;
private static int mContactNameColor = 0xff00008f;
private static boolean mMessageViewFixedWidthFont = false;
private static boolean mMessageViewReturnToList = false;
@ -382,8 +382,8 @@ public class K9 extends Application
editor.putBoolean("messageListTouchable",mMessageListTouchable);
editor.putBoolean("showContactName",mShowContactName);
editor.putBoolean("changeRegisteredNameColor",mChangeRegisteredNameColor);
editor.putInt("registeredNameColor",mRegisteredNameColor);
editor.putBoolean("changeRegisteredNameColor",mChangeContactNameColor);
editor.putInt("registeredNameColor",mContactNameColor);
editor.putBoolean("messageViewFixedWidthFont",mMessageViewFixedWidthFont);
editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList);
@ -423,8 +423,8 @@ public class K9 extends Application
mMessageListTouchable = sprefs.getBoolean("messageListTouchable",false);
mShowContactName = sprefs.getBoolean("showContactName", false);
mChangeRegisteredNameColor = sprefs.getBoolean("changeRegisteredNameColor", false);
mRegisteredNameColor = sprefs.getInt("registeredNameColor", 0xff00008f);
mChangeContactNameColor = sprefs.getBoolean("changeRegisteredNameColor", false);
mContactNameColor = sprefs.getInt("registeredNameColor", 0xff00008f);
mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
@ -701,24 +701,24 @@ public class K9 extends Application
mShowContactName = showContactName;
}
public static boolean changeRegisteredNameColor()
public static boolean changeContactNameColor()
{
return mChangeRegisteredNameColor;
return mChangeContactNameColor;
}
public static void setChangeRegisteredNameColor(boolean checkboxes)
public static void setChangeContactNameColor(boolean contactNameColor)
{
mChangeRegisteredNameColor = checkboxes;
mChangeContactNameColor = contactNameColor;
}
public static int getRegisteredNameColor()
public static int getContactNameColor()
{
return mRegisteredNameColor;
return mContactNameColor;
}
public static void setRegisteredNameColor(int registeredNameColor)
public static void setContactNameColor(int contactNameColor)
{
mRegisteredNameColor = registeredNameColor;
mContactNameColor = contactNameColor;
}
public static boolean messageViewFixedWidthFont()

32
src/com/fsck/k9/activity/setup/Prefs.java
View File

@ -50,7 +50,7 @@ public class Prefs extends K9PreferenceActivity
private static final String PREFERENCE_MESSAGELIST_CHECKBOXES = "messagelist_checkboxes";
private static final String PREFERENCE_MESSAGELIST_TOUCHABLE = "messagelist_touchable";
private static final String PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME = "messagelist_show_contact_name";
private static final String PREFERENCE_CHANGE_REGISTERED_NAME_COLOR = "change_registered_name_color";
private static final String PREFERENCE_MESSAGELIST_CONTACT_NAME_COLOR = "messagelist_contact_name_color";
private static final String PREFERENCE_MESSAGEVIEW_FIXEDWIDTH = "messageview_fixedwidth_font";
private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
@ -77,7 +77,7 @@ public class Prefs extends K9PreferenceActivity
private CheckBoxPreference mCheckboxes;
private CheckBoxPreference mTouchable;
private CheckBoxPreference mShowContactName;
private CheckBoxPreference mChangeRegisteredNameColor;
private CheckBoxPreference mChangeContactNameColor;
private CheckBoxPreference mFixedWidth;
private CheckBoxPreference mReturnToList;
@ -236,26 +236,26 @@ public class Prefs extends K9PreferenceActivity
mShowContactName = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_SHOW_CONTACT_NAME);
mShowContactName.setChecked(K9.showContactName());
mChangeRegisteredNameColor = (CheckBoxPreference)findPreference(PREFERENCE_CHANGE_REGISTERED_NAME_COLOR);
mChangeRegisteredNameColor.setChecked(K9.changeRegisteredNameColor());
if (K9.changeRegisteredNameColor())
mChangeRegisteredNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
mChangeContactNameColor = (CheckBoxPreference)findPreference(PREFERENCE_MESSAGELIST_CONTACT_NAME_COLOR);
mChangeContactNameColor.setChecked(K9.changeContactNameColor());
if (K9.changeContactNameColor())
mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
else
mChangeRegisteredNameColor.setSummary(R.string.global_settings_registered_name_color_default);
mChangeRegisteredNameColor.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_default);
mChangeContactNameColor.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
public boolean onPreferenceChange(Preference preference, Object newValue)
{
if ((boolean)(Boolean)newValue == true)
{
onChooseRegisteredNameColor();
mChangeRegisteredNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
onChooseContactNameColor();
mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_changed);
}
else
{
mChangeRegisteredNameColor.setSummary(R.string.global_settings_registered_name_color_default);
mChangeContactNameColor.setSummary(R.string.global_settings_registered_name_color_default);
}
mChangeRegisteredNameColor.setChecked((Boolean)newValue);
mChangeContactNameColor.setChecked((Boolean)newValue);
return false;
}
});
@ -314,7 +314,7 @@ public class Prefs extends K9PreferenceActivity
K9.setMessageListTouchable(mTouchable.isChecked());
K9.setShowContactName(mShowContactName.isChecked());
K9.setChangeRegisteredNameColor(mChangeRegisteredNameColor.isChecked());
K9.setChangeContactNameColor(mChangeContactNameColor.isChecked());
K9.setMessageViewFixedWidthFont(mFixedWidth.isChecked());
K9.setMessageViewReturnToList(mReturnToList.isChecked());
@ -358,15 +358,15 @@ public class Prefs extends K9PreferenceActivity
FontSizeSettings.actionEditSettings(this);
}
public void onChooseRegisteredNameColor()
public void onChooseContactNameColor()
{
new ColorPickerDialog(this, new ColorPickerDialog.OnColorChangedListener()
{
public void colorChanged(int color)
{
K9.setRegisteredNameColor(color);
K9.setContactNameColor(color);
}
},
K9.getRegisteredNameColor()).show();
K9.getContactNameColor()).show();
}
}

4
src/com/fsck/k9/mail/Address.java
View File

@ -275,10 +275,10 @@ public class Address
if (name != null)
{
if (K9.changeRegisteredNameColor())
if (K9.changeContactNameColor())
{
final SpannableString coloredName = new SpannableString(name);
coloredName.setSpan(new ForegroundColorSpan(K9.getRegisteredNameColor()),
coloredName.setSpan(new ForegroundColorSpan(K9.getContactNameColor()),
0,
coloredName.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE