Skip to content

Commit 5931dcb

Browse files
committed
fix: formatting issues
# Conflicts: # feature/thundermail/internal/common/src/main/kotlin/net/thunderbird/feature/thundermail/internal/common/navigation/DefaultThundermailNavigation.kt
1 parent c3eca3f commit 5931dcb

80 files changed

Lines changed: 195 additions & 37 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,11 @@ internal class AccountCreator(
143143
is SpecialFolderOption.None -> {
144144
if (isAutomatic) SpecialFolderSelection.AUTOMATIC else SpecialFolderSelection.MANUAL
145145
}
146+
146147
is SpecialFolderOption.Regular -> {
147148
SpecialFolderSelection.MANUAL
148149
}
150+
149151
is SpecialFolderOption.Special -> {
150152
if (isAutomatic) SpecialFolderSelection.AUTOMATIC else SpecialFolderSelection.MANUAL
151153
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fun LazyGridScope.tabItems() {
3131
icon = {
3232
when (tabItem) {
3333
PrimaryTabItems.TextOnly -> null
34+
3435
PrimaryTabItems.TextWithIcon, PrimaryTabItems.TextWithIconAndBadge ->
3536
Icon(imageVector = requireNotNull(tabItem.icon))
3637
}

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/app/badging/BadgingPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ package net.thunderbird.gradle.plugin.app.badging
22

33
import com.android.build.api.artifact.SingleArtifact
44
import com.android.build.api.variant.Aapt2
5+
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
56
import org.gradle.api.Plugin
67
import org.gradle.api.Project
8+
import org.gradle.api.tasks.Copy
79
import org.gradle.kotlin.dsl.assign
810
import org.gradle.kotlin.dsl.configure
9-
import com.android.build.api.variant.ApplicationAndroidComponentsExtension
10-
import org.gradle.api.tasks.Copy
1111
import org.gradle.kotlin.dsl.register
1212

1313
private val variantsToCheck = listOf("release", "beta", "daily")

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/app/badging/GenerateBadgingTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import org.gradle.api.tasks.TaskAction
1515
import org.gradle.process.ExecOperations
1616

1717
@CacheableTask
18-
abstract class GenerateBadgingTask : DefaultTask() {
18+
abstract class GenerateBadgingTask : DefaultTask() {
1919
@get:OutputFile
2020
abstract val badging: RegularFileProperty
2121

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package net.thunderbird.gradle.plugin.app.versioning
22

3+
import java.io.File
4+
import javax.xml.parsers.DocumentBuilderFactory
5+
import javax.xml.xpath.XPathConstants
6+
import javax.xml.xpath.XPathFactory
37
import org.gradle.api.DefaultTask
48
import org.gradle.api.file.ConfigurableFileCollection
59
import org.gradle.api.file.RegularFileProperty
@@ -10,10 +14,6 @@ import org.gradle.api.tasks.InputFiles
1014
import org.gradle.api.tasks.Optional
1115
import org.gradle.api.tasks.OutputFile
1216
import org.gradle.api.tasks.TaskAction
13-
import java.io.File
14-
import javax.xml.parsers.DocumentBuilderFactory
15-
import javax.xml.xpath.XPathConstants
16-
import javax.xml.xpath.XPathFactory
1717

1818
abstract class PrintVersionInfoTask : DefaultTask() {
1919
@get:Input

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ class VersioningPlugin : Plugin<Project> {
7474
if (it.isLowerCase()) it.titlecase() else it.toString()
7575
}
7676
}
77-
78-

build-plugin/plugin/src/main/kotlin/net/thunderbird/gradle/plugin/quality/coverage/filter/ComposeFilter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal fun KoverReportFiltersConfig.composeFilter() {
99
classes(
1010
// Compose Resources
1111
"*.Res",
12-
"*.ActualResourceCollectorsKt"
12+
"*.ActualResourceCollectorsKt",
1313
)
1414

1515
annotatedBy(

cli/autodiscovery-cli/src/main/kotlin/app/k9mail/cli/autodiscovery/SerialRunner.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ class SerialRunner(private val runnables: List<AutoDiscoveryRunnable>) {
2121
is Settings -> {
2222
return discoveryResult
2323
}
24+
2425
is NetworkError -> {
2526
networkErrorCount++
2627
if (networkError == null) {
2728
networkError = discoveryResult
2829
}
2930
}
31+
3032
NoUsableSettingsFound -> { }
33+
3134
is UnexpectedException -> {
3235
Log.w(discoveryResult.exception, "Unexpected exception")
3336
}

core/android/common/src/main/kotlin/app/k9mail/core/android/common/compat/BundleCompat.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ object BundleCompat {
1212
@JvmStatic
1313
fun <T : Serializable> getSerializable(bundle: Bundle, key: String?, clazz: Class<T>): T? = when {
1414
Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> bundle.getSerializable(key, clazz)
15+
1516
else -> {
1617
@Suppress("DEPRECATION")
1718
val serializable = bundle.getSerializable(key)

core/android/permissions/src/main/kotlin/app/k9mail/core/android/permissions/AndroidPermissionChecker.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class AndroidPermissionChecker(
1818
Permission.Contacts -> {
1919
checkSelfPermission(Manifest.permission.READ_CONTACTS)
2020
}
21+
2122
Permission.Notifications -> {
2223
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
2324
checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS)

0 commit comments

Comments
 (0)