Merge branch '5181-Mail_UI_improvement-part01' into 'main' (47f67b26) · Commits · e / os / Mail

app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ interface MessageStore {
		fun <T> getDisplayFolders(displayMode: FolderMode, outboxFolderId: Long?, mapper: FolderMapper<T>): List<T>

		/**
		* Check if all given folders are included in the Unified Inbox.
		* Check if all given folders are included in the All Inboxes.
		*/
		fun areAllIncludedInUnifiedInbox(folderIds: Collection<Long>): Boolean

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class LocalSearch implements SearchSpecification {
		// Public manipulation methods
		///////////////////////////////////////////////////////////////
		/**
		* Set the ID of the search. This is used to identify a unified inbox
		* Set the ID of the search. This is used to identify a All Inboxes
		* search
		*
		* @param id ID to set

+1 −19

Original line number	Diff line number	Diff line
		@@ -3,25 +3,7 @@

		<!-- Must be kept in sync with arrays_drawer.xml/drawer_account_accent_color_dark_theme -->
		<integer-array name="account_colors">
		<item>0xFFFFB300</item> <!-- Amber 600 -->
		<item>0xFFFB8C00</item> <!-- Orange 600 -->
		<item>0xFFF4511E</item> <!-- Deep orange 600 -->
		<item>0xFFE53935</item> <!-- Red 600 -->

		<item>0xFFC0CA33</item> <!-- Lime 600 -->
		<item>0xFF7CB342</item> <!-- Light green 600 -->
		<item>0xFF388E3C</item> <!-- Green 700 -->
		<item>0xFF00897B</item> <!-- Teal 600 -->

		<item>0xFF00ACC1</item> <!-- Cyan 600 -->
		<item>0xFF039BE5</item> <!-- Light blue 600 -->
		<item>0xFF1976D2</item> <!-- Blue 700 -->
		<item>0xFF3949AB</item> <!-- Indigo 600 -->

		<item>0xFFE91E63</item> <!-- Pink 500 -->
		<item>0xFF8E24AA</item> <!-- Purple 600 -->
		<item>0xFF5E35B1</item> <!-- Deep purple 600 -->
		<item>0xFF455A64</item> <!-- Blue gray 700 -->
		<item>0xFF0086FF</item>
		</integer-array>

		<string-array name="check_frequency_values" translatable="false">

+1 −19

Original line number	Diff line number	Diff line
		@@ -3,25 +3,7 @@

		<!-- Must be kept in sync with arrays_account_settings_values.xml/account_colors -->
		<integer-array name="drawer_account_accent_color_dark_theme">
		<item>0xFFFFB300</item> <!-- Amber 600 -->
		<item>0xFFFF9800</item> <!-- Orange 500 -->
		<item>0xFFFF7043</item> <!-- Deep orange 400 -->
		<item>0xFFEF5350</item> <!-- Red 400 -->

		<item>0xFFC0CA33</item> <!-- Lime 600 -->
		<item>0xFF7CB342</item> <!-- Light green 600 -->
		<item>0xFF4CAF50</item> <!-- Green 500 -->
		<item>0xFF4DB6AC</item> <!-- Teal 300 -->

		<item>0xFF00ACC1</item> <!-- Cyan 600 -->
		<item>0xFF03A9F4</item> <!-- Light blue 500 -->
		<item>0xFF42A5F5</item> <!-- Blue 400 -->
		<item>0xFF9FA8DA</item> <!-- Indigo 200 -->

		<item>0xFFF48FB1</item> <!-- Pink 200 -->
		<item>0xFFCE93D8</item> <!-- Purple 200 -->
		<item>0xFFB39DDB</item> <!-- Deep purple 200 -->
		<item>0xFF90A4AE</item> <!-- Blue gray 300 -->
		<item>0xFF5DB2FF</item>
		</integer-array>

		</resources>

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ class TestCoreResourceProvider : CoreResourceProvider {
		override fun replyHeader(sender: String) = "$sender wrote:"
		override fun replyHeader(sender: String, sentDate: String) = "On $sentDate, $sender wrote:"

		override fun searchUnifiedInboxTitle() = "Unified Inbox"
		override fun searchUnifiedInboxTitle() = "All Inboxes"
		override fun searchUnifiedInboxDetail() = "All messages in unified folders"

		override fun outboxFolderName() = "Outbox"