Merge branch 'main' into configure_notification_actions

Author: harshad1

app-common/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
 
     implementation(projects.feature.account.avatar.api)
     implementation(projects.feature.account.avatar.impl)
+    implementation(projects.feature.account.settings.api)
     implementation(projects.feature.account.setup)
     implementation(projects.feature.mail.account.api)
     implementation(projects.feature.mail.message.composer)

app-common/src/main/kotlin/net/thunderbird/app/common/account/AppCommonAccountModule.kt

@@ -6,9 +6,11 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import net.thunderbird.app.common.account.data.DefaultAccountProfileLocalDataSource
 import net.thunderbird.app.common.account.data.DefaultLegacyAccountManager
+import net.thunderbird.app.common.account.data.DefaultLegacyAccountRepository
 import net.thunderbird.core.android.account.AccountDefaultsProvider
 import net.thunderbird.core.android.account.LegacyAccount
 import net.thunderbird.core.android.account.LegacyAccountManager
+import net.thunderbird.core.android.account.LegacyAccountRepository
 import net.thunderbird.feature.account.avatar.AvatarIcon
 import net.thunderbird.feature.account.avatar.AvatarIconCatalog
 import net.thunderbird.feature.account.avatar.AvatarMonogramCreator
@@ -73,6 +75,12 @@ internal val appCommonAccountModule = module {
         DefaultAvatarMonogramCreator()
     }
 
+    factory<LegacyAccountRepository> {
+        DefaultLegacyAccountRepository(
+            accountManager = get(),
+        )
+    }
+
     factory<AccountSetupExternalContract.AccountCreator> {
         AccountCreator(
             accountColorPicker = get(),

app-common/src/main/kotlin/net/thunderbird/app/common/account/data/DefaultLegacyAccountRepository.kt

@@ -0,0 +1,14 @@
+package net.thunderbird.app.common.account.data
+
+import net.thunderbird.core.android.account.LegacyAccount
+import net.thunderbird.core.android.account.LegacyAccountManager
+import net.thunderbird.core.android.account.LegacyAccountRepository
+import net.thunderbird.feature.account.AccountId
+
+class DefaultLegacyAccountRepository(private val accountManager: LegacyAccountManager) : LegacyAccountRepository {
+    override fun getById(id: AccountId) = accountManager.getById(id)
+
+    override suspend fun update(account: LegacyAccount) {
+        accountManager.update(account)
+    }
+}

app-common/src/main/kotlin/net/thunderbird/app/common/startup/StartupRouter.kt

@@ -3,10 +3,10 @@ package net.thunderbird.app.common.startup
 import android.app.Activity
 import app.k9mail.feature.launcher.FeatureLauncherActivity
 import app.k9mail.feature.launcher.FeatureLauncherTarget
-import com.fsck.k9.account.BackgroundAccountRemover
 import com.fsck.k9.activity.MessageHomeActivity
 import net.thunderbird.core.android.account.LegacyAccount
 import net.thunderbird.core.android.account.LegacyAccountManager
+import net.thunderbird.feature.account.settings.api.BackgroundAccountRemover
 
 interface StartupRouter {
     fun routeToNextScreen(activity: Activity)

app-ui-catalog/src/main/kotlin/net/thunderbird/ui/catalog/ui/page/atom/items/SelectionControlItems.kt

@@ -1,13 +1,22 @@
 package net.thunderbird.ui.catalog.ui.page.atom.items
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.LazyGridScope
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import app.k9mail.core.ui.compose.designsystem.atom.Checkbox
+import app.k9mail.core.ui.compose.designsystem.atom.DropdownMenuBox
 import app.k9mail.core.ui.compose.designsystem.atom.RadioGroup
 import app.k9mail.core.ui.compose.designsystem.atom.Switch
 import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodySmall
@@ -18,6 +27,7 @@ import net.thunderbird.ui.catalog.ui.page.common.list.defaultItem
 import net.thunderbird.ui.catalog.ui.page.common.list.defaultItemPadding
 import net.thunderbird.ui.catalog.ui.page.common.list.sectionHeaderItem
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Suppress("LongMethod")
 fun LazyGridScope.selectionControlItems() {
     sectionHeaderItem(text = "Checkbox")
@@ -84,6 +94,46 @@ fun LazyGridScope.selectionControlItems() {
             )
         }
     }
+
+    sectionHeaderItem(text = "Dropdown Menu")
+    defaultItem {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            modifier = Modifier
+                .padding(defaultItemPadding()),
+        ) {
+            var expanded by remember { mutableStateOf(false) }
+            val options = persistentListOf(
+                "Option 1",
+                "Option 2",
+                "Option 3",
+                "Option 4",
+            )
+            var selectedOption by remember { mutableStateOf(options[0]) }
+
+            DropdownMenuBox(
+                expanded = expanded,
+                onExpandedChange = { shouldExpand ->
+                    expanded = shouldExpand
+                },
+                options = options,
+                onItemSelected = {
+                    expanded = false
+                    selectedOption = it
+                },
+            ) {
+                Row(
+                    modifier = Modifier.clickable(onClick = { expanded = true }),
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    TextTitleMedium(
+                        text = selectedOption,
+                    )
+                    ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
+                }
+            }
+        }
+    }
 }
 
 private fun LazyGridScope.captionItem(

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/app/versioning/VersioningPlugin.kt

@@ -34,13 +34,13 @@ class VersioningPlugin : Plugin<Project> {
                 val printVersionInfoTaskName = "printVersionInfo$variantName"
 
                 tasks.register<PrintVersionInfoTask>(printVersionInfoTaskName) {
-                    val versionInfo = getVersionInfo(variant).get()
+                    val versionInfoProvider = getVersionInfo(variant)
 
                     applicationId = variant.applicationId
                     applicationLabel = getApplicationLabel(variant)
-                    versionCode = versionInfo.versionCode
-                    versionName = versionInfo.versionName
-                    versionNameSuffix = versionInfo.versionNameSuffix
+                    versionCode = versionInfoProvider.map { it.versionCode }
+                    versionName = versionInfoProvider.map { it.versionName }
+                    versionNameSuffix = versionInfoProvider.map { it.versionNameSuffix }
 
                     // Set outputFile only if provided via -PoutputFile=...
                     project.findProperty("outputFile")?.toString()?.let { path ->

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

@@ -0,0 +1,20 @@
+package net.thunderbird.core.android.account
+
+import kotlinx.coroutines.flow.Flow
+import net.thunderbird.feature.account.AccountId
+
+interface LegacyAccountRepository {
+    /**
+     * Returns a flow of the account with the specified [id].
+     *
+     * @param id The ID of the account.
+     */
+    fun getById(id: AccountId): Flow<LegacyAccount?>
+
+    /**
+     * Updates the specified [account].
+     *
+     * @param account The account to update.
+     */
+    suspend fun update(account: LegacyAccount)
+}

core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/DropdownMenuBox.kt

@@ -0,0 +1,53 @@
+package app.k9mail.core.ui.compose.designsystem.atom
+
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import kotlinx.collections.immutable.ImmutableList
+import androidx.compose.material3.DropdownMenu as Material3DropdownMenu
+import androidx.compose.material3.DropdownMenuItem as Material3DropdownMenuItem
+import androidx.compose.material3.ExposedDropdownMenuBox as Material3ExposedDropdownMenuBox
+import androidx.compose.material3.Text as Material3Text
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun <T> DropdownMenuBox(
+    expanded: Boolean,
+    onExpandedChange: (Boolean) -> Unit,
+    options: ImmutableList<T>,
+    onItemSelected: (T) -> Unit,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    optionToString: (T) -> String = { it.toString() },
+    anchorContent: @Composable (expanded: Boolean) -> Unit,
+) {
+    Material3ExposedDropdownMenuBox(
+        expanded = expanded,
+        onExpandedChange = {
+            if (enabled) {
+                onExpandedChange(expanded)
+            }
+        },
+        modifier = modifier,
+    ) {
+        anchorContent(expanded)
+
+        Material3DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { onExpandedChange(false) },
+        ) {
+            options.forEach { option ->
+                Material3DropdownMenuItem(
+                    text = {
+                        Material3Text(text = optionToString(option))
+                    },
+                    onClick = {
+                        onItemSelected(option)
+                    },
+                    contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
+                )
+            }
+        }
+    }
+}

core/ui/compose/designsystem/src/main/kotlin/net/thunderbird/core/ui/compose/designsystem/atom/icon/Icons.kt

@@ -28,6 +28,7 @@ import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.KeyboardArrowDown
 import androidx.compose.material.icons.outlined.KeyboardArrowUp
 import androidx.compose.material.icons.outlined.Menu
+import androidx.compose.material.icons.outlined.MoreVert
 import androidx.compose.material.icons.outlined.Report
 import androidx.compose.material.icons.outlined.Security
 import androidx.compose.material.icons.outlined.Settings
@@ -138,6 +139,7 @@ object Icons {
         val KeyboardArrowUp: ImageVector = Icons.Outlined.KeyboardArrowUp
 
         val Menu: ImageVector = Icons.Outlined.Menu
+        val MoreVert: ImageVector = Icons.Outlined.MoreVert
 
         val OpenInNew: ImageVector = OutlinedOpenInNewIcon
         val Outbox: ImageVector = Icons.Filled.Outbox

core/ui/setting/api/src/commonMain/kotlin/net/thunderbird/core/ui/setting/SettingValue.kt

@@ -132,6 +132,8 @@ sealed interface SettingValue<T> : Setting {
      * @param id The unique identifier for the setting.
      * @param title A lambda that returns the title of the setting.
      * @param description A lambda that returns the description of the setting. Default is null.
+     * @param displayValueAsSecondaryText When `true`, the currently selected [value]
+     * will be displayed as secondary text in the UI (e.g., subtitle style).
      * @param icon A lambda that returns the icon of the setting as an [ImageVector]. Default is null.
      * @param value The currently selected option.
      * @param options The list of available options to choose from.
@@ -141,6 +143,7 @@ sealed interface SettingValue<T> : Setting {
         val title: () -> String,
         val description: () -> String? = { null },
         val icon: () -> ImageVector? = { null },
+        val displayValueAsSecondaryText: Boolean = false,
         override val value: SelectOption,
         val options: ImmutableList<SelectOption>,
     ) : SettingValue<SelectOption> {