Merge pull request #6532 from thundernest/remove_font_size_settings (34be0134) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/FontSizes.java

+1 −61

Original line number	Diff line number	Diff line
		@@ -8,14 +8,9 @@ import com.fsck.k9.preferences.StorageEditor;


		/**
		* Manage font size of the information displayed in the account list, folder
		* list, message list and in the message view.
		* Manage font size of the information displayed in the message list and in the message view.
		*/
		public class FontSizes {
		private static final String ACCOUNT_NAME = "fontSizeAccountName";
		private static final String ACCOUNT_DESCRIPTION = "fontSizeAccountDescription";
		private static final String FOLDER_NAME = "fontSizeFolderName";
		private static final String FOLDER_STATUS = "fontSizeFolderStatus";
		private static final String MESSAGE_LIST_SUBJECT = "fontSizeMessageListSubject";
		private static final String MESSAGE_LIST_SENDER = "fontSizeMessageListSender";
		private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate";
		@@ -40,11 +35,6 @@ public class FontSizes {
		public static final int LARGE = 22; // ?android:attr/textAppearanceLarge


		private int accountName;
		private int accountDescription;
		private int folderName;
		private int folderStatus;

		private int messageListSubject;
		private int messageListSender;
		private int messageListDate;
		@@ -61,12 +51,6 @@ public class FontSizes {


		public FontSizes() {
		accountName = FONT_DEFAULT;
		accountDescription = FONT_DEFAULT;

		folderName = FONT_DEFAULT;
		folderStatus = FONT_DEFAULT;

		messageListSubject = FONT_DEFAULT;
		messageListSender = FONT_DEFAULT;
		messageListDate = FONT_DEFAULT;
		@@ -85,12 +69,6 @@ public class FontSizes {
		}

		public void save(StorageEditor editor) {
		editor.putInt(ACCOUNT_NAME, accountName);
		editor.putInt(ACCOUNT_DESCRIPTION, accountDescription);

		editor.putInt(FOLDER_NAME, folderName);
		editor.putInt(FOLDER_STATUS, folderStatus);

		editor.putInt(MESSAGE_LIST_SUBJECT, messageListSubject);
		editor.putInt(MESSAGE_LIST_SENDER, messageListSender);
		editor.putInt(MESSAGE_LIST_DATE, messageListDate);
		@@ -109,12 +87,6 @@ public class FontSizes {
		}

		public void load(Storage storage) {
		accountName = storage.getInt(ACCOUNT_NAME, accountName);
		accountDescription = storage.getInt(ACCOUNT_DESCRIPTION, accountDescription);

		folderName = storage.getInt(FOLDER_NAME, folderName);
		folderStatus = storage.getInt(FOLDER_STATUS, folderStatus);

		messageListSubject = storage.getInt(MESSAGE_LIST_SUBJECT, messageListSubject);
		messageListSender = storage.getInt(MESSAGE_LIST_SENDER, messageListSender);
		messageListDate = storage.getInt(MESSAGE_LIST_DATE, messageListDate);
		@@ -137,38 +109,6 @@ public class FontSizes {
		setMessageViewContentAsPercent(storage.getInt(MESSAGE_VIEW_CONTENT_PERCENT, 100));
		}

		public int getAccountName() {
		return accountName;
		}

		public void setAccountName(int accountName) {
		this.accountName = accountName;
		}

		public int getAccountDescription() {
		return accountDescription;
		}

		public void setAccountDescription(int accountDescription) {
		this.accountDescription = accountDescription;
		}

		public int getFolderName() {
		return folderName;
		}

		public void setFolderName(int folderName) {
		this.folderName = folderName;
		}

		public int getFolderStatus() {
		return folderStatus;
		}

		public void setFolderStatus(int folderStatus) {
		this.folderStatus = folderStatus;
		}

		public int getMessageListSubject() {
		return messageListSubject;
		}

app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -76,18 +76,6 @@ public class GeneralSettingsDescriptions {
		s.put("enableSensitiveLogging", Settings.versions(
		new V(1, new BooleanSetting(false))
		));
		s.put("fontSizeAccountDescription", Settings.versions(
		new V(1, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));
		s.put("fontSizeAccountName", Settings.versions(
		new V(1, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));
		s.put("fontSizeFolderName", Settings.versions(
		new V(1, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));
		s.put("fontSizeFolderStatus", Settings.versions(
		new V(1, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));
		s.put("fontSizeMessageComposeInput", Settings.versions(
		new V(5, new FontSizeSetting(FontSizes.FONT_DEFAULT))
		));

app/core/src/main/java/com/fsck/k9/preferences/Settings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class Settings {
		*
		* @see SettingsExporter
		*/
		public static final int VERSION = 83;
		public static final int VERSION = 84;

		static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
		Map<String, String> importedSettings, boolean useDefaultValues) {

app/ui/legacy/src/main/java/com/fsck/k9/activity/AccountList.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ import android.widget.TextView;

		import com.fsck.k9.Account;
		import com.fsck.k9.BaseAccount;
		import com.fsck.k9.FontSizes;
		import com.fsck.k9.K9;
		import com.fsck.k9.Preferences;
		import com.fsck.k9.ui.R;
		@@ -31,7 +30,6 @@ import com.fsck.k9.search.SearchAccount;
		* </p>
		*/
		public abstract class AccountList extends K9ListActivity implements OnItemClickListener {
		private FontSizes mFontSizes = K9.getFontSizes();

		@Override
		public void onCreate(Bundle icicle) {
		@@ -135,9 +133,6 @@ public abstract class AccountList extends K9ListActivity implements OnItemClickL

		holder.chip.getBackground().setAlpha(255);

		mFontSizes.setViewTextSize(holder.description, mFontSizes.getAccountName());
		mFontSizes.setViewTextSize(holder.email, mFontSizes.getAccountDescription());


		return view;
		}

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -110,10 +110,6 @@ class GeneralSettingsDataStore(
		"background_ops" -> K9.backgroundOps.name
		"quiet_time_starts" -> K9.quietTimeStarts
		"quiet_time_ends" -> K9.quietTimeEnds
		"account_name_font" -> K9.fontSizes.accountName.toString()
		"account_description_font" -> K9.fontSizes.accountDescription.toString()
		"folder_name_font" -> K9.fontSizes.folderName.toString()
		"folder_status_font" -> K9.fontSizes.folderStatus.toString()
		"message_list_subject_font" -> K9.fontSizes.messageListSubject.toString()
		"message_list_sender_font" -> K9.fontSizes.messageListSender.toString()
		"message_list_date_font" -> K9.fontSizes.messageListDate.toString()
		@@ -151,10 +147,6 @@ class GeneralSettingsDataStore(
		"background_ops" -> setBackgroundOps(value)
		"quiet_time_starts" -> K9.quietTimeStarts = value
		"quiet_time_ends" -> K9.quietTimeEnds = value
		"account_name_font" -> K9.fontSizes.accountName = value.toInt()
		"account_description_font" -> K9.fontSizes.accountDescription = value.toInt()
		"folder_name_font" -> K9.fontSizes.folderName = value.toInt()
		"folder_status_font" -> K9.fontSizes.folderStatus = value.toInt()
		"message_list_subject_font" -> K9.fontSizes.messageListSubject = value.toInt()
		"message_list_sender_font" -> K9.fontSizes.messageListSender = value.toInt()
		"message_list_date_font" -> K9.fontSizes.messageListDate = value.toInt()