From edf0361aab4bfd9601ea4d8a92714cf2b6c3832c Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 12 Jan 2012 01:05:01 +0100 Subject: [PATCH] Added font size setting for text input fields in MessageCompose --- res/values/strings.xml | 3 +++ res/xml/font_preferences.xml | 14 +++++++++++++ src/com/fsck/k9/FontSizes.java | 21 +++++++++++++++++++ src/com/fsck/k9/activity/MessageCompose.java | 14 +++++++++++++ .../k9/activity/setup/FontSizeSettings.java | 8 +++++++ .../fsck/k9/preferences/GlobalSettings.java | 3 +++ src/com/fsck/k9/preferences/Settings.java | 2 +- 7 files changed, 64 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5e31de571..f2666ff53 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -986,6 +986,9 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Date Message body + Message composition + Text input fields + Tiniest Tiny Smaller diff --git a/res/xml/font_preferences.xml b/res/xml/font_preferences.xml index 7df5d3f5e..52606d089 100644 --- a/res/xml/font_preferences.xml +++ b/res/xml/font_preferences.xml @@ -160,4 +160,18 @@ + + + + + + diff --git a/src/com/fsck/k9/FontSizes.java b/src/com/fsck/k9/FontSizes.java index a45216b2e..30df6fe0c 100644 --- a/src/com/fsck/k9/FontSizes.java +++ b/src/com/fsck/k9/FontSizes.java @@ -27,6 +27,7 @@ public class FontSizes { private static final String MESSAGE_VIEW_TIME = "fontSizeMessageViewTime"; private static final String MESSAGE_VIEW_DATE = "fontSizeMessageViewDate"; private static final String MESSAGE_VIEW_CONTENT = "fontSizeMessageViewContent"; + private static final String MESSAGE_COMPOSE_INPUT = "fontSizeMessageComposeInput"; /* * Values for the font sizes in DIP (device independent pixel) @@ -122,6 +123,12 @@ public class FontSizes { */ private TextSize messageViewContent = TextSize.NORMAL; + /** + * Font size for the input fields in the message compose activity. + */ + private int messageComposeInput; + + /** * Create a FontSizes object with default values. */ @@ -144,6 +151,8 @@ public class FontSizes { messageViewSubject = FONT_12DIP; messageViewTime = FONT_10DIP; messageViewDate = FONT_10DIP; + + messageComposeInput = MEDIUM; } /** @@ -171,6 +180,8 @@ public class FontSizes { editor.putInt(MESSAGE_VIEW_TIME, messageViewTime); editor.putInt(MESSAGE_VIEW_DATE, messageViewDate); editor.putInt(MESSAGE_VIEW_CONTENT, getMessageViewContentAsInt()); + + editor.putInt(MESSAGE_COMPOSE_INPUT, messageComposeInput); } /** @@ -198,6 +209,8 @@ public class FontSizes { messageViewTime = prefs.getInt(MESSAGE_VIEW_TIME, messageViewTime); messageViewDate = prefs.getInt(MESSAGE_VIEW_DATE, messageViewDate); setMessageViewContent(prefs.getInt(MESSAGE_VIEW_CONTENT, 3)); + + messageComposeInput = prefs.getInt(MESSAGE_COMPOSE_INPUT, messageComposeInput); } public int getAccountName() { @@ -359,4 +372,12 @@ public class FontSizes { break; } } + + public int getMessageComposeInput() { + return messageComposeInput; + } + + public void setMessageComposeInput(int messageComposeInput) { + this.messageComposeInput = messageComposeInput; + } } diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 9c17178c6..ec08ee33e 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -30,6 +30,7 @@ import android.os.Parcelable; import android.provider.OpenableColumns; import android.text.util.Rfc822Tokenizer; import android.util.Log; +import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -57,6 +58,7 @@ import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Account.MessageFormat; import com.fsck.k9.EmailAddressAdapter; import com.fsck.k9.EmailAddressValidator; +import com.fsck.k9.FontSizes; import com.fsck.k9.Identity; import com.fsck.k9.K9; import com.fsck.k9.Preferences; @@ -273,6 +275,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc private EmailAddressAdapter mAddressAdapter; private Validator mAddressValidator; + private FontSizes mFontSizes = K9.getFontSizes(); + static class Attachment implements Serializable { private static final long serialVersionUID = 3642382876618963734L; @@ -690,6 +694,16 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc } mDraftNeedsSaving = false; + + // Set font size of input controls + int fontSize = mFontSizes.getMessageComposeInput(); + mToView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mCcView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mBccView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mSubjectView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mMessageContentView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mQuotedText.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); + mSignatureView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, fontSize); } /** diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/src/com/fsck/k9/activity/setup/FontSizeSettings.java index 8760d107c..f0d1cda18 100644 --- a/src/com/fsck/k9/activity/setup/FontSizeSettings.java +++ b/src/com/fsck/k9/activity/setup/FontSizeSettings.java @@ -36,6 +36,7 @@ public class FontSizeSettings extends K9PreferenceActivity { private static final String PREFERENCE_MESSAGE_VIEW_TIME_FONT = "message_view_time_font"; private static final String PREFERENCE_MESSAGE_VIEW_DATE_FONT = "message_view_date_font"; private static final String PREFERENCE_MESSAGE_VIEW_CONTENT_FONT = "message_view_content_font"; + private static final String PREFERENCE_MESSAGE_COMPOSE_INPUT_FONT = "message_compose_input_font"; private ListPreference mAccountName; private ListPreference mAccountDescription; @@ -53,6 +54,7 @@ public class FontSizeSettings extends K9PreferenceActivity { private ListPreference mMessageViewTime; private ListPreference mMessageViewDate; private ListPreference mMessageViewContent; + private ListPreference mMessageComposeInput; /** @@ -123,6 +125,10 @@ public class FontSizeSettings extends K9PreferenceActivity { mMessageViewContent = setupListPreference( PREFERENCE_MESSAGE_VIEW_CONTENT_FONT, Integer.toString(fontSizes.getMessageViewContentAsInt())); + + mMessageComposeInput = setupListPreference( + PREFERENCE_MESSAGE_COMPOSE_INPUT_FONT, + Integer.toString(fontSizes.getMessageComposeInput())); } /** @@ -152,6 +158,8 @@ public class FontSizeSettings extends K9PreferenceActivity { fontSizes.setMessageViewDate(Integer.parseInt(mMessageViewDate.getValue())); fontSizes.setMessageViewContent(Integer.parseInt(mMessageViewContent.getValue())); + fontSizes.setMessageComposeInput(Integer.parseInt(mMessageComposeInput.getValue())); + SharedPreferences preferences = Preferences.getPreferences(this).getPreferences(); Editor editor = preferences.edit(); fontSizes.save(editor); diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java index 96254d0d9..12f0c7ecf 100644 --- a/src/com/fsck/k9/preferences/GlobalSettings.java +++ b/src/com/fsck/k9/preferences/GlobalSettings.java @@ -77,6 +77,9 @@ public class GlobalSettings { s.put("fontSizeFolderStatus", Settings.versions( new V(1, new FontSizeSetting(FontSizes.SMALL)) )); + s.put("fontSizeMessageComposeInput", Settings.versions( + new V(5, new FontSizeSetting(FontSizes.MEDIUM)) + )); s.put("fontSizeMessageListDate", Settings.versions( new V(1, new FontSizeSetting(FontSizes.SMALL)) )); diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java index 305224f83..3ae1feb1d 100644 --- a/src/com/fsck/k9/preferences/Settings.java +++ b/src/com/fsck/k9/preferences/Settings.java @@ -35,7 +35,7 @@ public class Settings { * * @see SettingsExporter */ - public static final int VERSION = 4; + public static final int VERSION = 5; public static Map validate(int version, Map> settings,