yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Set initial flag on new categories (#7800)

Browse Source 
- Use the same flag as other categories
- Per-category uses the flag the user used before starting to use per-category
This commit is contained in:
Andreas 2022-08-18 20:06:52 +02:00 committed by GitHub
parent 09abfc7843
commit 4228bbb88e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/domain/DomainModule.kt
View File

@ -79,7 +79,7 @@ class DomainModule : InjektModule {
addFactory { ResetCategoryFlags(get(), get()) } addFactory { ResetCategoryFlags(get(), get()) }
addFactory { SetDisplayModeForCategory(get(), get()) } addFactory { SetDisplayModeForCategory(get(), get()) }
addFactory { SetSortModeForCategory(get(), get()) } addFactory { SetSortModeForCategory(get(), get()) }
addFactory { CreateCategoryWithName(get()) } addFactory { CreateCategoryWithName(get(), get()) }
addFactory { RenameCategory(get()) } addFactory { RenameCategory(get()) }
addFactory { ReorderCategory(get()) } addFactory { ReorderCategory(get()) }
addFactory { UpdateCategory(get()) } addFactory { UpdateCategory(get()) }

11
app/src/main/java/eu/kanade/domain/category/interactor/CreateCategoryWithName.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.domain.category.interactor
import eu.kanade.domain.category.model.Category import eu.kanade.domain.category.model.Category
import eu.kanade.domain.category.model.anyWithName import eu.kanade.domain.category.model.anyWithName
import eu.kanade.domain.category.repository.CategoryRepository import eu.kanade.domain.category.repository.CategoryRepository
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.util.system.logcat import eu.kanade.tachiyomi.util.system.logcat
import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -10,8 +11,16 @@ import logcat.LogPriority
class CreateCategoryWithName( class CreateCategoryWithName(
private val categoryRepository: CategoryRepository, private val categoryRepository: CategoryRepository,
private val preferences: PreferencesHelper,
) { ) {
private val initialFlags: Long
get() {
return preferences.libraryDisplayMode().get().flag or
preferences.librarySortingMode().get().flag or
preferences.librarySortingAscending().get().flag
}
suspend fun await(name: String): Result = withContext(NonCancellable) { suspend fun await(name: String): Result = withContext(NonCancellable) {
val categories = categoryRepository.getAll() val categories = categoryRepository.getAll()
if (categories.anyWithName(name)) { if (categories.anyWithName(name)) {
@ -23,7 +32,7 @@ class CreateCategoryWithName(
id = 0, id = 0,
name = name, name = name,
order = nextOrder, order = nextOrder,
flags = 0, flags = initialFlags,
) )
try { try {