Update linter

(cherry picked from commit ae7df4fb7f)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/domain/source/model/Source.kt
#	app/src/main/java/eu/kanade/presentation/source/MigrateSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/source/SourceFilterScreen.kt
#	app/src/main/java/eu/kanade/presentation/source/SourceScreen.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
This commit is contained in:
arkon
2022-05-10 17:54:52 -04:00
committed by Jobobby04
parent c1c934011f
commit 24c5563a02
64 changed files with 157 additions and 154 deletions
+1 -1
View File
@@ -416,7 +416,7 @@ object EXHMigrations {
source = it.substringBefore(':').toLongOrNull() ?: return@forEach,
name = content["name"]!!.jsonPrimitive.content,
query = content["query"]!!.jsonPrimitive.contentOrNull?.nullIfBlank(),
filters_json = Json.encodeToString(content["filters"]!!.jsonArray)
filters_json = Json.encodeToString(content["filters"]!!.jsonArray),
)
}
}
@@ -84,7 +84,7 @@ class SettingsDebugController : BasicComposeController() {
Box(
Modifier
.fillMaxSize()
.nestedScroll(nestedScrollInterop)
.nestedScroll(nestedScrollInterop),
) {
var running by remember { mutableStateOf(false) }
var result by remember { mutableStateOf<Pair<String, String>?>(null) }
@@ -94,7 +94,7 @@ class SettingsDebugController : BasicComposeController() {
text = "Functions",
color = MaterialTheme.colorScheme.primary,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(16.dp)
modifier = Modifier.padding(16.dp),
)
}
items(functions.orEmpty()) { (func, name) ->
@@ -123,7 +123,7 @@ class SettingsDebugController : BasicComposeController() {
text = "Toggles",
color = MaterialTheme.colorScheme.primary,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(16.dp)
modifier = Modifier.padding(16.dp),
)
}
items(toggles) { (name, pref, default) ->
@@ -134,7 +134,7 @@ class SettingsDebugController : BasicComposeController() {
.capitalize(Locale.getDefault()),
subtitleAnnotated = if (pref.value != default) {
AnnotatedString("MODIFIED", SpanStyle(color = Color.Red))
} else null
} else null,
)
}
item {
@@ -145,7 +145,7 @@ class SettingsDebugController : BasicComposeController() {
running && result == null,
enter = fadeIn(),
exit = fadeOut(),
modifier = Modifier.fillMaxSize()
modifier = Modifier.fillMaxSize(),
) {
Box(
Modifier
@@ -158,7 +158,7 @@ class SettingsDebugController : BasicComposeController() {
}
}
},
contentAlignment = Alignment.Center
contentAlignment = Alignment.Center,
) {
CircularProgressIndicator()
}
@@ -174,7 +174,7 @@ class SettingsDebugController : BasicComposeController() {
SelectionContainer {
Text(text = result?.second.orEmpty())
}
}
},
)
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ object EHTags {
Character.getTags(),
Group.getTags(),
Artist.getTags(),
Artist2.getTags()
Artist2.getTags(),
).flatten().flatten()
fun getNamespaces0Tags() = listOf(
+1 -1
View File
@@ -13,6 +13,6 @@ interface TagList {
getTags1(),
getTags2(),
getTags3(),
getTags4()
getTags4(),
)
}