Add sort by size feature

Author: Kilian Hu

core/android/account/src/main/kotlin/net/thunderbird/core/android/account/SortType.kt

@@ -8,4 +8,5 @@ enum class SortType(val isDefaultAscending: Boolean) {
     SORT_UNREAD(true),
     SORT_FLAGGED(true),
     SORT_ATTACHMENT(true),
+    SORT_SIZE(false),
 }

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/DisplaySettings.kt

@@ -18,6 +18,7 @@ const val DISPLAY_SETTINGS_DEFAULT_SHOULD_SHOW_SETUP_ARCHIVE_FOLDER_DIALOG = tru
 const val DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT = false
 const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_NAME = false
 const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE = true
+const val DISPLAY_SETTINGS_DEFAULT_IS_SHOW_MESSAGE_SIZE = false
 const val DISPLAY_SETTINGS_DEFAULT_IS_CHANGE_CONTACT_NAME_COLOR = true
 const val DISPLAY_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE = false
 const val DISPLAY_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR = false
@@ -44,6 +45,7 @@ data class DisplaySettings(
     val isMessageListSenderAboveSubject: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT,
     val isShowContactName: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_NAME,
     val isShowContactPicture: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE,
+    val isShowMessageSize: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_SHOW_MESSAGE_SIZE,
     val isChangeContactNameColor: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_CHANGE_CONTACT_NAME_COLOR,
     val isColorizeMissingContactPictures: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_COLORIZE_MISSING_CONTACT_PICTURE,
     val isUseBackgroundAsUnreadIndicator: Boolean = DISPLAY_SETTINGS_DEFAULT_IS_USE_BACKGROUND_AS_INDICATOR,

core/preference/api/src/commonMain/kotlin/net/thunderbird/core/preference/display/DisplaySettingsPreferenceManager.kt

@@ -23,6 +23,7 @@ const val KEY_MESSAGE_VIEW_FIXED_WIDTH_FONT = "messageViewFixedWidthFont"
 const val KEY_AUTO_FIT_WIDTH = "autofitWidth"
 const val KEY_MESSAGE_LIST_SENDER_ABOVE_SUBJECT = "messageListSenderAboveSubject"
 const val KEY_SHOW_CONTACT_PICTURE = "showContactPicture"
+const val KEY_SHOW_MESSAGE_SIZE = "showMessageSize"
 const val KEY_APP_LANGUAGE = "language"
 const val KEY_SPLIT_VIEW_MODE = "splitViewMode"
 

core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/DefaultDisplaySettingsPreferenceManager.kt

@@ -119,6 +119,10 @@ class DefaultDisplaySettingsPreferenceManager(
             KEY_SHOW_CONTACT_PICTURE,
             DISPLAY_SETTINGS_DEFAULT_IS_SHOW_CONTACT_PICTURE,
         ),
+        isShowMessageSize = storage.getBoolean(
+            KEY_SHOW_MESSAGE_SIZE,
+            DISPLAY_SETTINGS_DEFAULT_IS_SHOW_MESSAGE_SIZE,
+        ),
         appLanguage = storage.getStringOrDefault(
             KEY_APP_LANGUAGE,
             DISPLAY_SETTINGS_DEFAULT_APP_LANGUAGE,
@@ -176,6 +180,10 @@ class DefaultDisplaySettingsPreferenceManager(
                     KEY_SHOW_CONTACT_PICTURE,
                     config.isShowContactPicture,
                 )
+                storageEditor.putBoolean(
+                    KEY_SHOW_MESSAGE_SIZE,
+                    config.isShowMessageSize,
+                )
                 storageEditor.putBoolean(
                     KEY_USE_BACKGROUND_AS_UNREAD_INDICATOR,
                     config.isUseBackgroundAsUnreadIndicator,

feature/widget/message-list-glance/src/debug/kotlin/net/thunderbird/feature/widget/message/list/ui/MessageListWidgetContentPreview.kt

@@ -38,6 +38,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 1",
             color = Color.BLUE,
             isRead = false,
+            size = 1L,
         ),
         generateMessageListItem(
             displayName = "Bob",
@@ -46,6 +47,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 2",
             color = Color.RED,
             isRead = true,
+            size = 2L * 1024L,
         ),
         generateMessageListItem(
             displayName = "Charlie",
@@ -54,6 +56,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 3",
             color = Color.RED,
             isRead = false,
+            size = 3L * 1024L * 1024L,
         ),
     )
 }
@@ -65,6 +68,7 @@ private fun generateMessageListItem(
     preview: String,
     color: Int,
     isRead: Boolean,
+    size: Long,
 ): MessageListItem {
     return MessageListItem(
         displayName = displayName,
@@ -82,5 +86,6 @@ private fun generateMessageListItem(
         sortInternalDate = 0,
         sortIsStarred = false,
         sortDatabaseId = 0,
+        sortSize = size,
     )
 }

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItem.kt

@@ -19,4 +19,5 @@ internal data class MessageListItem(
     val sortInternalDate: Long,
     val sortIsStarred: Boolean,
     val sortDatabaseId: Long,
+    val sortSize: Long,
 )

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItemMapper.kt

@@ -51,6 +51,7 @@ internal class MessageListItemMapper(
             sortInternalDate = message.internalDate,
             sortIsStarred = message.isStarred,
             sortDatabaseId = message.id,
+            sortSize = message.size,
         )
     }
 

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListLoader.kt

@@ -72,6 +72,7 @@ internal class MessageListLoader(
             SortType.SORT_SUBJECT -> "${MessageColumns.SUBJECT} COLLATE NOCASE"
             SortType.SORT_UNREAD -> MessageColumns.READ
             SortType.SORT_DATE -> MessageColumns.DATE
+            SortType.SORT_SIZE -> MessageColumns.SIZE
         }
 
         val sortDirection = if (config.sortAscending) " ASC" else " DESC"
@@ -122,6 +123,11 @@ internal class MessageListLoader(
                 compareBy<MessageListItem>(!config.sortAscending) { it.hasAttachments }
                     .thenByDate(config)
             }
+
+            SortType.SORT_SIZE -> {
+                compareBy<MessageListItem>(config.sortAscending) { it.sortSize }
+                    .thenByDate(config)
+            }
         }.thenByDescending { it.sortDatabaseId }
 
         return this.sortedWith(comparator)

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt

@@ -19,4 +19,5 @@ internal data class MessageListItem(
     val sortInternalDate: Long,
     val sortIsStarred: Boolean,
     val sortDatabaseId: Long,
+    val sortSize: Long,
 )

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

@@ -51,6 +51,7 @@ internal class MessageListItemMapper(
             sortInternalDate = message.internalDate,
             sortIsStarred = message.isStarred,
             sortDatabaseId = message.id,
+            sortSize = message.size,
         )
     }