refactor: cleanup lint issues

build-plugin/src/main/kotlin/AndroidExtension.kt

@@ -24,7 +24,6 @@ internal fun CommonExtension<*, *, *, *, *, *>.configureSharedConfig(project: Pr
         abortOnError = true
         checkDependencies = true
         lintConfig = project.file("${project.rootProject.projectDir}/config/lint/lint.xml")
-        baseline = project.file("${project.rootProject.projectDir}/config/lint/android-lint-baseline.xml")
         checkReleaseBuilds = System.getenv("CI_CHECK_RELEASE_BUILDS")?.toBoolean() ?: true
     }
 

config/lint/lint.xml

@@ -14,10 +14,6 @@
 
     <issue id="UnusedResources" severity="warning" />
 
-    <issue id="ViewModelConstructorInComposable">
-        <ignore path="**/debug/**" />
-    </issue>
-
     <issue id="all">
         <ignore path="**/ui-utils/ItemTouchHelper/**"/>
         <ignore path="**/ui-utils/LinearLayoutManager/**"/>

core/android/common/src/main/kotlin/net/thunderbird/core/android/common/view/WebViewExtensions.kt

@@ -13,10 +13,5 @@ private fun WebView.setupThemeMode(darkTheme: Boolean) {
             this.settings,
             darkTheme,
         )
-    } else if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
-        WebSettingsCompat.setForceDark(
-            this.settings,
-            if (darkTheme) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF,
-        )
     }
 }

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

@@ -4,6 +4,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExposedDropdownMenuDefaults
+import androidx.compose.material3.MenuAnchorType
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -22,8 +23,6 @@ import androidx.compose.material3.ExposedDropdownMenuBox as Material3ExposedDrop
 import androidx.compose.material3.OutlinedTextField as Material3OutlinedTextField
 import androidx.compose.material3.Text as Material3Text
 
-// TODO replace Material3 DropdownMenu with Material3 ExposedDropdownMenu once it's size issue is fixed
-// see: https://issuetracker.google.com/issues/205589613
 @OptIn(ExperimentalMaterial3Api::class)
 @Suppress("LongParameterList", "LongMethod")
 @Composable
@@ -60,7 +59,7 @@ fun <T> TextFieldOutlinedSelect(
             onValueChange = { },
             modifier = Modifier
                 .fillMaxWidth()
-                .menuAnchor()
+                .menuAnchor(MenuAnchorType.PrimaryNotEditable)
                 .then(modifier),
             enabled = isEnabled,
             readOnly = true,

feature/account/edit/src/debug/kotlin/app/k9mail/feature/account/edit/ui/server/settings/save/SaveServerSettingsScreenPreview.kt

@@ -2,6 +2,7 @@ package app.k9mail.feature.account.edit.ui.server.settings.save
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.edit.ui.server.settings.save.fake.FakeSaveServerSettingsViewModel
 
@@ -13,9 +14,11 @@ internal fun SaveServerSettingsScreenK9Preview() {
             title = "Incoming server settings",
             onNext = {},
             onBack = {},
-            viewModel = FakeSaveServerSettingsViewModel(
-                isIncoming = true,
-            ),
+            viewModel = viewModel {
+                FakeSaveServerSettingsViewModel(
+                    isIncoming = true,
+                )
+            },
         )
     }
 }

feature/account/server/certificate/src/debug/kotlin/app/k9mail/feature/account/server/certificate/ui/ServerCertificateErrorScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.certificate.ui
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.common.koin.koinPreview
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
@@ -62,12 +63,14 @@ internal fun ServerCertificateErrorScreenPreview() {
             ServerCertificateErrorScreen(
                 onCertificateAccepted = {},
                 onBack = {},
-                viewModel = ServerCertificateErrorViewModel(
-                    addServerCertificateException = { _, _, _ -> },
-                    certificateErrorRepository = InMemoryServerCertificateErrorRepository(serverCertificateError),
-                    formatServerCertificateError = FormatServerCertificateError(),
-                    initialState = ServerCertificateErrorContract.State(isShowServerCertificate = false),
-                ),
+                viewModel = viewModel {
+                    ServerCertificateErrorViewModel(
+                        addServerCertificateException = { _, _, _ -> },
+                        certificateErrorRepository = InMemoryServerCertificateErrorRepository(serverCertificateError),
+                        formatServerCertificateError = FormatServerCertificateError(),
+                        initialState = ServerCertificateErrorContract.State(isShowServerCertificate = false),
+                    )
+                },
             )
         }
     }

feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/incoming/IncomingServerSettingsScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.settings.ui.incoming
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.common.domain.entity.InteractionMode
@@ -13,11 +14,13 @@ internal fun IncomingServerSettingsScreenPreview() {
         IncomingServerSettingsScreen(
             onNext = {},
             onBack = {},
-            viewModel = IncomingServerSettingsViewModel(
-                mode = InteractionMode.Create,
-                validator = IncomingServerSettingsValidator(),
-                accountStateRepository = FakeAccountStateRepository(),
-            ),
+            viewModel = viewModel {
+                IncomingServerSettingsViewModel(
+                    mode = InteractionMode.Create,
+                    validator = IncomingServerSettingsValidator(),
+                    accountStateRepository = FakeAccountStateRepository(),
+                )
+            },
         )
     }
 }

feature/account/server/settings/src/debug/kotlin/app/k9mail/feature/account/server/settings/ui/outgoing/IncomingServerSettingsScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.settings.ui.outgoing
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.common.domain.entity.InteractionMode
@@ -13,11 +14,13 @@ internal fun OutgoingServerSettingsScreenPreview() {
         OutgoingServerSettingsScreen(
             onNext = {},
             onBack = {},
-            viewModel = OutgoingServerSettingsViewModel(
-                mode = InteractionMode.Create,
-                validator = OutgoingServerSettingsValidator(),
-                accountStateRepository = FakeAccountStateRepository(),
-            ),
+            viewModel = viewModel {
+                OutgoingServerSettingsViewModel(
+                    mode = InteractionMode.Create,
+                    validator = OutgoingServerSettingsValidator(),
+                    accountStateRepository = FakeAccountStateRepository(),
+                )
+            },
         )
     }
 }

feature/account/server/validation/src/debug/kotlin/app/k9mail/feature/account/server/validation/ui/ServerValidationContentPreview.kt

@@ -3,6 +3,7 @@ package app.k9mail.feature.account.server.validation.ui
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.oauth.ui.fake.FakeAccountOAuthViewModel
 
@@ -14,7 +15,7 @@ internal fun IncomingServerValidationContentPreview() {
             onEvent = { },
             state = ServerValidationContract.State(),
             isIncomingValidation = true,
-            oAuthViewModel = FakeAccountOAuthViewModel(),
+            oAuthViewModel = viewModel { FakeAccountOAuthViewModel() },
             contentPadding = PaddingValues(),
         )
     }
@@ -28,7 +29,7 @@ internal fun OutgoingServerValidationContentPreview() {
             onEvent = { },
             state = ServerValidationContract.State(),
             isIncomingValidation = false,
-            oAuthViewModel = FakeAccountOAuthViewModel(),
+            oAuthViewModel = viewModel { FakeAccountOAuthViewModel() },
             contentPadding = PaddingValues(),
         )
     }

feature/account/server/validation/src/debug/kotlin/app/k9mail/feature/account/server/validation/ui/ServerValidationMainScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.validation.ui
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.server.validation.ui.fake.FakeAccountOAuthViewModel
@@ -13,9 +14,11 @@ import app.k9mail.feature.account.server.validation.ui.fake.FakeOutgoingServerVa
 internal fun IncomingServerValidationMainScreenPreview() {
     PreviewWithTheme {
         ServerValidationMainScreen(
-            viewModel = FakeIncomingServerValidationViewModel(
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                FakeIncomingServerValidationViewModel(
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
             brandNameProvider = FakeBrandNameProvider,
         )
     }
@@ -26,9 +29,11 @@ internal fun IncomingServerValidationMainScreenPreview() {
 internal fun OutgoingServerValidationMainScreenPreview() {
     PreviewWithTheme {
         ServerValidationMainScreen(
-            viewModel = FakeOutgoingServerValidationViewModel(
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                FakeOutgoingServerValidationViewModel(
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
             brandNameProvider = FakeBrandNameProvider,
         )
     }

feature/account/server/validation/src/debug/kotlin/app/k9mail/feature/account/server/validation/ui/ServerValidationScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.validation.ui
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.common.ui.fake.FakeAccountStateRepository
@@ -16,13 +17,15 @@ internal fun IncomingServerValidationScreenPreview() {
         ServerValidationScreen(
             onNext = { },
             onBack = { },
-            viewModel = IncomingServerValidationViewModel(
-                accountStateRepository = FakeAccountStateRepository(),
-                validateServerSettings = { ServerSettingsValidationResult.Success },
-                authorizationStateRepository = { true },
-                certificateErrorRepository = InMemoryServerCertificateErrorRepository(),
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                IncomingServerValidationViewModel(
+                    accountStateRepository = FakeAccountStateRepository(),
+                    validateServerSettings = { ServerSettingsValidationResult.Success },
+                    authorizationStateRepository = { true },
+                    certificateErrorRepository = InMemoryServerCertificateErrorRepository(),
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
             brandNameProvider = FakeBrandNameProvider,
         )
     }
@@ -35,13 +38,15 @@ internal fun OutgoingServerValidationScreenPreview() {
         ServerValidationScreen(
             onNext = { },
             onBack = { },
-            viewModel = OutgoingServerValidationViewModel(
-                accountStateRepository = FakeAccountStateRepository(),
-                validateServerSettings = { ServerSettingsValidationResult.Success },
-                authorizationStateRepository = { true },
-                certificateErrorRepository = InMemoryServerCertificateErrorRepository(),
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                OutgoingServerValidationViewModel(
+                    accountStateRepository = FakeAccountStateRepository(),
+                    validateServerSettings = { ServerSettingsValidationResult.Success },
+                    authorizationStateRepository = { true },
+                    certificateErrorRepository = InMemoryServerCertificateErrorRepository(),
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
             brandNameProvider = FakeBrandNameProvider,
         )
     }

feature/account/server/validation/src/debug/kotlin/app/k9mail/feature/account/server/validation/ui/ServerValidationToolbarScreenPreview.kt

@@ -1,6 +1,7 @@
 package app.k9mail.feature.account.server.validation.ui
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.viewModel
 import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
 import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
 import app.k9mail.feature.account.server.validation.ui.fake.FakeAccountOAuthViewModel
@@ -12,9 +13,11 @@ internal fun IncomingServerValidationToolbarScreenPreview() {
     PreviewWithTheme {
         ServerValidationToolbarScreen(
             title = "Incoming server settings",
-            viewModel = FakeIncomingServerValidationViewModel(
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                FakeIncomingServerValidationViewModel(
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
         )
     }
 }
@@ -25,9 +28,11 @@ internal fun OutgoingServerValidationToolbarScreenPreview() {
     PreviewWithTheme {
         ServerValidationToolbarScreen(
             title = "Incoming server settings",
-            viewModel = FakeIncomingServerValidationViewModel(
-                oAuthViewModel = FakeAccountOAuthViewModel(),
-            ),
+            viewModel = viewModel {
+                FakeIncomingServerValidationViewModel(
+                    oAuthViewModel = FakeAccountOAuthViewModel(),
+                )
+            },
         )
     }
 }