Skip to content

Commit 0bd1045

Browse files
committed
refactor(message-list): move UiDensity to :core:preference:api
1 parent 0f6ceea commit 0bd1045

File tree

12 files changed

+30
-15
lines changed

12 files changed

+30
-15
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package net.thunderbird.core.preference.display.visualSettings.message.list
2+
3+
/**
4+
* Represents the different density levels for the user interface, specifically for the message list.
5+
* This determines the spacing of UI elements.
6+
*/
7+
enum class UiDensity {
8+
/**
9+
* A dense layout with minimal spacing, allowing more items to be visible on the screen at once.
10+
*/
11+
Compact,
12+
13+
/** The standard, default density level, offering a balanced layout. */
14+
Default,
15+
16+
/**
17+
* Provides the most spacing between items, resulting in a less cluttered and more spread-out view.
18+
*/
19+
Relaxed,
20+
}

legacy/core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ dependencies {
4747
implementation(libs.mime4j.dom)
4848
implementation(libs.uri)
4949
implementation(projects.feature.navigation.drawer.api)
50+
implementation(projects.feature.mail.message.list.api)
5051
implementation(projects.feature.mail.message.reader.api)
5152

5253
testApi(projects.core.testing)

legacy/core/src/main/java/com/fsck/k9/K9.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import net.thunderbird.core.android.account.AccountDefaultsProvider
1414
import net.thunderbird.core.android.account.SortType
1515
import net.thunderbird.core.featureflag.FeatureFlagProvider
1616
import net.thunderbird.core.featureflag.toFeatureFlagKey
17+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
1718
import net.thunderbird.core.preference.storage.Storage
1819
import net.thunderbird.core.preference.storage.StorageEditor
1920
import net.thunderbird.core.preference.storage.getEnumOrDefault

legacy/core/src/main/java/com/fsck/k9/UiDensity.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.fsck.k9.FontSizes;
1515
import com.fsck.k9.K9.NotificationQuickDelete;
1616
import com.fsck.k9.K9.PostMarkAsUnreadNavigation;
17-
import com.fsck.k9.UiDensity;
1817
import com.fsck.k9.core.R;
1918
import com.fsck.k9.preferences.Settings.BooleanSetting;
2019
import com.fsck.k9.preferences.Settings.ColorSetting;
@@ -45,6 +44,7 @@
4544
import net.thunderbird.core.preference.interaction.PostRemoveNavigation;
4645
import net.thunderbird.core.preference.network.NetworkSettingsKt;
4746
import net.thunderbird.core.preference.storage.Storage;
47+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity;
4848

4949
import static com.fsck.k9.K9.LockScreenNotificationVisibility;
5050
import static net.thunderbird.core.preference.display.inboxSettings.DisplayInboxSettingsKt.DISPLAY_SETTINGS_DEFAULT_IS_MESSAGE_LIST_SENDER_ABOVE_SUBJECT;

legacy/ui/legacy/src/debug/kotlin/com/fsck/k9/ui/messagelist/item/MessageItemContentPreview.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import app.k9mail.core.android.common.contact.Contact
66
import app.k9mail.core.android.common.contact.ContactRepository
77
import app.k9mail.core.ui.compose.designsystem.PreviewWithThemesLightDark
88
import com.fsck.k9.FontSizes
9-
import com.fsck.k9.UiDensity
109
import com.fsck.k9.mail.AuthType
1110
import com.fsck.k9.mail.ConnectionSecurity
1211
import com.fsck.k9.mail.ServerSettings
@@ -15,6 +14,7 @@ import com.fsck.k9.ui.messagelist.MessageListItem
1514
import net.thunderbird.core.android.account.Identity
1615
import net.thunderbird.core.android.account.LegacyAccount
1716
import net.thunderbird.core.common.mail.EmailAddress
17+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
1818
import net.thunderbird.feature.account.AccountIdFactory
1919
import net.thunderbird.feature.account.avatar.AvatarMonogramCreator
2020
import net.thunderbird.feature.account.storage.profile.AvatarDto

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.fsck.k9.activity
22

33
import com.fsck.k9.K9
4-
import com.fsck.k9.UiDensity
54
import net.thunderbird.core.common.action.SwipeAction
65
import net.thunderbird.core.preference.AppTheme
76
import net.thunderbird.core.preference.GeneralSettingsManager
87
import net.thunderbird.core.preference.SplitViewMode
98
import net.thunderbird.core.preference.SubTheme
9+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
1010

1111
data class MessageListActivityConfig(
1212
val appTheme: AppTheme,

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.fsck.k9.ui.messagelist
22

33
import com.fsck.k9.FontSizes
4-
import com.fsck.k9.UiDensity
4+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
55

66
data class MessageListAppearance(
77
val fontSizes: FontSizes,

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/item/MessageItemContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import app.k9mail.core.ui.compose.designsystem.atom.CircularProgressIndicator
2323
import app.k9mail.core.ui.compose.designsystem.atom.image.RemoteImage
2424
import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleSmall
2525
import app.k9mail.core.ui.compose.theme2.MainTheme
26-
import com.fsck.k9.UiDensity
2726
import com.fsck.k9.ui.messagelist.MessageListAppearance
2827
import com.fsck.k9.ui.messagelist.MessageListItem
2928
import kotlin.time.ExperimentalTime
3029
import kotlin.time.Instant
3130
import kotlinx.datetime.TimeZone
3231
import kotlinx.datetime.toLocalDateTime
32+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
3333
import net.thunderbird.core.ui.compose.designsystem.organism.message.ActiveMessageItem
3434
import net.thunderbird.core.ui.compose.designsystem.organism.message.MessageItemDefaults
3535
import net.thunderbird.core.ui.compose.designsystem.organism.message.ReadMessageItem

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/item/MessageViewHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.core.graphics.drawable.DrawableCompat
2020
import androidx.core.view.isVisible
2121
import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
2222
import com.fsck.k9.FontSizes
23-
import com.fsck.k9.UiDensity
2423
import com.fsck.k9.contacts.ContactPictureLoader
2524
import com.fsck.k9.helper.Utility
2625
import com.fsck.k9.mail.Address
@@ -31,6 +30,7 @@ import com.fsck.k9.ui.messagelist.MessageListItem
3130
import com.google.android.material.textview.MaterialTextView
3231
import java.util.Locale
3332
import kotlin.math.max
33+
import net.thunderbird.core.preference.display.visualSettings.message.list.UiDensity
3434

3535
@Suppress("TooManyFunctions")
3636
class MessageViewHolder(

0 commit comments

Comments
 (0)