Switch to different ktlint plugin
Should be better at incremental builds. To format, run `./gradlew ktlintFormat`. (cherry picked from commit d29b7c4e5735dc137d578d3bcb3da1f0a02573e8) # Conflicts: # buildSrc/src/main/kotlin/tachiyomi.lint.gradle.kts # data/src/main/java/tachiyomi/data/manga/MangaMapper.kt # domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt # domain/src/main/java/tachiyomi/domain/library/service/LibraryPreferences.kt # domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt # presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt
This commit is contained in:
@@ -184,7 +184,7 @@ fun CategoryDeleteDialog(
|
||||
TextButton(onClick = {
|
||||
onDelete()
|
||||
onDismissRequest()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_ok))
|
||||
}
|
||||
},
|
||||
@@ -239,7 +239,7 @@ fun ChangeCategoryDialog(
|
||||
tachiyomi.presentation.core.components.material.TextButton(onClick = {
|
||||
onDismissRequest()
|
||||
onEditCategories()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_edit))
|
||||
}
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
|
||||
@@ -61,7 +61,7 @@ fun HistoryDeleteDialog(
|
||||
TextButton(onClick = {
|
||||
onDelete(removeEverything)
|
||||
onDismissRequest()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_remove))
|
||||
}
|
||||
},
|
||||
@@ -90,7 +90,7 @@ fun HistoryDeleteAllDialog(
|
||||
TextButton(onClick = {
|
||||
onDelete()
|
||||
onDismissRequest()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_ok))
|
||||
}
|
||||
},
|
||||
|
||||
@@ -102,7 +102,7 @@ fun SetIntervalDialog(
|
||||
TextButton(onClick = {
|
||||
onValueChanged(selectedInterval)
|
||||
onDismissRequest()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_ok))
|
||||
}
|
||||
},
|
||||
|
||||
@@ -139,11 +139,11 @@ fun MoreScreen(
|
||||
stringResource(R.string.paused)
|
||||
} else {
|
||||
"${stringResource(R.string.paused)} • ${
|
||||
pluralStringResource(
|
||||
id = R.plurals.download_queue_summary,
|
||||
count = pending,
|
||||
pending,
|
||||
)
|
||||
pluralStringResource(
|
||||
id = R.plurals.download_queue_summary,
|
||||
count = pending,
|
||||
pending,
|
||||
)
|
||||
}"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -741,7 +741,7 @@ object SettingsAdvancedScreen : SearchableSettings {
|
||||
subtitle = stringResource(R.string.log_level_summary),
|
||||
entries = EHLogLevel.values().mapIndexed { index, ehLogLevel ->
|
||||
index to "${context.getString(ehLogLevel.nameRes)} (${
|
||||
context.getString(ehLogLevel.description)
|
||||
context.getString(ehLogLevel.description)
|
||||
})"
|
||||
}.toMap(),
|
||||
),
|
||||
|
||||
@@ -21,7 +21,7 @@ fun UpdatesDeleteConfirmationDialog(
|
||||
TextButton(onClick = {
|
||||
onConfirm()
|
||||
onDismissRequest()
|
||||
},) {
|
||||
}) {
|
||||
Text(text = stringResource(R.string.action_ok))
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user