From 1039601bc18df0f8d3d37ec2bf67dd2641281ff8 Mon Sep 17 00:00:00 2001 From: Jay Date: Thu, 16 Jan 2020 23:24:09 -0800 Subject: [PATCH] Using langauge name for default categories in settings --- .../eu/kanade/tachiyomi/data/database/models/Category.kt | 6 ++++-- .../java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt | 5 +++-- .../tachiyomi/ui/setting/SettingsLibraryController.kt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt index 7a7e0a243a..1991e74bb6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt @@ -27,8 +27,10 @@ interface Category : Serializable { this.name = name } - fun createDefault(): Category = create("Default").apply { - id = 0 } + fun createDefault(context: Context): Category = create(context.getString(R.string.default_columns)) + .apply { + id = + 0 } } } \ No newline at end of file diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 05ed2171ec..526a34b00c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -200,7 +200,7 @@ class LibraryPresenter( db.getTotalChapterManga().executeAsBlocking().associate { it.id!! to counter++ } } val catListing by lazy { - val default = Category.createDefault() + val default = Category.createDefault(context) val defOrder = preferences.defaultMangaOrder().getOrDefault() if (defOrder.firstOrNull()?.isLetter() == true) default.mangaSort = defOrder.first() else default.mangaOrder = defOrder.split("/").mapNotNull { it.toLongOrNull() } @@ -284,7 +284,8 @@ class LibraryPresenter( */ private fun getLibraryObservable(): Observable { return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) { dbCategories, libraryManga -> - val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault()) + dbCategories + val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault + (context)) + dbCategories else dbCategories this.categories = categories diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 33ef97cd22..d9f7a16b17 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -132,7 +132,7 @@ class SettingsLibraryController : SettingsController() { key = Keys.defaultCategory titleRes = R.string.default_category - val categories = listOf(Category.createDefault()) + dbCategories + val categories = listOf(Category.createDefault(context)) + dbCategories entries = listOf(context.getString(R.string.default_category_summary)) + categories.map { it.name }.toTypedArray() entryValues = listOf(-1) + categories.mapNotNull { it.id }.toList()