Use Compose for Category screen (#7454)

* Use Compose for Category screen

* Use correct string for CategoryRenameDialog title

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>

Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
(cherry picked from commit 86bacbe586)

# Conflicts:
#	app/src/main/java/eu/kanade/data/category/CategoryRepositoryImpl.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/InsertCategory.kt
#	app/src/main/java/eu/kanade/domain/category/repository/CategoryRepository.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryAdapter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryItem.kt
#	app/src/main/res/layout/categories_item.xml
This commit is contained in:
Andreas
2022-07-09 18:31:14 +02:00
committed by Jobobby04
parent 6651ba7211
commit 4e29fd5b2a
79 changed files with 1767 additions and 2739 deletions
+2 -2
View File
@@ -123,8 +123,8 @@ class GalleryAdder(
insertManga.await(
Manga.create().copy(
source = source.id,
url = cleanedMangaUrl
)
url = cleanedMangaUrl,
),
)
getManga.await(cleanedMangaUrl, source.id)!!
}
@@ -3,8 +3,8 @@ package exh.favorites
import android.content.Context
import android.net.wifi.WifiManager
import android.os.PowerManager
import eu.kanade.domain.category.interactor.CreateCategoryWithName
import eu.kanade.domain.category.interactor.GetCategories
import eu.kanade.domain.category.interactor.InsertCategory
import eu.kanade.domain.category.interactor.SetMangaCategories
import eu.kanade.domain.category.interactor.UpdateCategory
import eu.kanade.domain.category.model.Category
@@ -55,7 +55,7 @@ class FavoritesSyncHelper(val context: Context) {
private val getManga: GetManga by injectLazy()
private val updateManga: UpdateManga by injectLazy()
private val setMangaCategories: SetMangaCategories by injectLazy()
private val insertCategory: InsertCategory by injectLazy()
private val createCategoryWithName: CreateCategoryWithName by injectLazy()
private val updateCategory: UpdateCategory by injectLazy()
private val prefs: PreferencesHelper by injectLazy()
@@ -208,9 +208,10 @@ class FavoritesSyncHelper(val context: Context) {
categories.forEachIndexed { index, remote ->
val local = localCategories.getOrElse(index) {
when (val insertCategoryResult = insertCategory.await(remote, index.toLong())) {
is InsertCategory.Result.Error -> throw insertCategoryResult.error
is InsertCategory.Result.Success -> Category(insertCategoryResult.id, remote, index.toLong(), 0L, emptyList())
when (val createCategoryWithNameResult = createCategoryWithName.await(remote)) {
is CreateCategoryWithName.Result.InternalError -> throw createCategoryWithNameResult.error
CreateCategoryWithName.Result.NameAlreadyExistsError -> throw IllegalStateException("Category $remote already exists")
is CreateCategoryWithName.Result.Success -> createCategoryWithNameResult.category
}
}