Disabled Tabbed Library

Likely to be removed forever Also global update no longer shows download paused notification when queing up Also bumped up to vCode 62 since 0.9.82 is out Also fixed issue when the manga details header is taller than the screen
2024-11-09 05:25:08 +01:00 · 2020-03-29 00:08:09 -04:00 · 2020-03-29 00:08:09 -04:00 · 44446b8f8a
commit 44446b8f8a
parent b48cff63e4
13 changed files with 30 additions and 43 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -34,8 +34,8 @@ android {
        minSdkVersion(23)
        targetSdkVersion(29)
        applicationId = "eu.kanade.tachiyomi"
-        versionCode = 61
-        versionName = "0.9.81"
+        versionCode = 62
+        versionName = "0.9.82"
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
        multiDexEnabled = true

@ -51,7 +51,7 @@ android {
    }
    buildTypes {
        getByName("debug") {
-            applicationIdSuffix = ".debug"
+            applicationIdSuffix = ".debugJ2K"
        }
        getByName("release") {
            applicationIdSuffix = ".j2k"
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@ -64,7 +64,7 @@ object Migrations {
            }
            if (oldVersion < 54)
                DownloadProvider(context).renameChaapters()
-            if (oldVersion < 61)
+            if (oldVersion < 62)
                LibraryPresenter.resetCustomManga()
            return true
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
@ -10,6 +10,7 @@ import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
+import eu.kanade.tachiyomi.data.library.LibraryUpdateService
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
@ -263,7 +264,7 @@ class Downloader(
                // Start downloader if needed
                if (autoStart && wasEmpty) {
                    DownloadService.start(this@Downloader.context)
-                } else if (!isRunning) {
+                } else if (!isRunning && !LibraryUpdateService.isRunning()) {
                    notifier.onDownloadPaused()
                }
            }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
@ -8,8 +8,6 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.util.lang.chop
 import eu.kanade.tachiyomi.util.lang.removeArticles
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.text.SimpleDateFormat
 import java.util.Calendar
@ -25,8 +23,7 @@ class LibraryCategoryAdapter(val libraryListener: LibraryListener) :
        FlexibleAdapter<IFlexible<*>>(null, libraryListener, true) {

    init {
-        setDisplayHeadersAtStartUp(Injekt.get<PreferencesHelper>().libraryAsSingleList()
-            .getOrDefault())
+        setDisplayHeadersAtStartUp(true)
    }
    /**
     * The list of manga in this category.
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@ -150,8 +150,6 @@ open class LibraryController(

    var libraryLayout: Int = preferences.libraryLayout().getOrDefault()

-    private var usePager: Boolean = !preferences.libraryAsSingleList().getOrDefault()
-
    open fun contentView(): View = pager_layout

    init {
@ -522,7 +520,7 @@ open class LibraryController(
    override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
        mode.menuInflater.inflate(R.menu.library_selection, menu)
        val selectItem = menu.findItem(R.id.action_select_all)
-        selectItem.isVisible = !preferences.libraryAsSingleList().getOrDefault()
+        selectItem.isVisible = false
        return true
    }

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListController.kt
@ -126,7 +126,7 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
            resetRecyclerY()
            return
        }
-        if (flinging) return
+        if (flinging || presenter.categories.size <= 1) return
        if (isDragging) {
            resetScrollingValues()
            resetRecyclerY(false)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@ -99,8 +99,6 @@ class LibraryPresenter(
    fun getLibrary() {
        launchUI {
            totalChapters = null
-            val freshStart = !preferences.libraryAsSingleList().getOrDefault() &&
-                (currentMangaMap?.values?.firstOrNull()?.firstOrNull()?.header != null)
            val mangaMap = withContext(Dispatchers.IO) {
                val library = getLibraryFromDB()
                library.apply { setDownloadCount(library.mangaMap) }
@ -111,7 +109,7 @@ class LibraryPresenter(
                mangaMap
            }
            currentMangaMap = mangaMap
-            updateView(categories, mangaMap, freshStart)
+            updateView(categories, mangaMap)
            withContext(Dispatchers.IO) {
                setTotalChapters()
            }
@ -315,8 +313,7 @@ class LibraryPresenter(
        }

        val ascending = preferences.librarySortingAscending().getOrDefault()
-        val useDnD = preferences.libraryAsSingleList().getOrDefault() && !preferences
-            .hideCategories().getOrDefault()
+        val useDnD = !preferences.hideCategories().getOrDefault()

        val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 ->
            i1.chapterCount = -1
@ -394,7 +391,8 @@ class LibraryPresenter(
            val category = initCat ?: allCategories.find { it.id == i1.manga.category } ?: return 0
            if (category.mangaOrder.isNullOrEmpty() && category.mangaSort == null) {
                category.changeSortTo(preferences.librarySortingMode().getOrDefault())
-                db.insertCategory(category).asRxObservable().subscribe()
+                if (category.id == 0) preferences.defaultMangaOrder().set(category.mangaSort.toString())
+                else db.insertCategory(category).asRxObservable().subscribe()
            }
            val compare = when {
                category.mangaSort != null -> {
@ -466,7 +464,7 @@ class LibraryPresenter(
        val showCategories = !preferences.hideCategories().getOrDefault()
        val unreadBadgeType = preferences.unreadBadgeType().getOrDefault()
        var libraryManga = db.getLibraryMangas().executeAsBlocking()
-        val singleList = preferences.libraryAsSingleList().getOrDefault()
+        val singleList = true
        if (!showCategories)
            libraryManga = libraryManga.distinctBy { it.id }
        /*val libraryMap = libraryManga.map { manga ->
@ -505,12 +503,10 @@ class LibraryPresenter(
                    // LibraryItem(manga, libraryLayout).apply { unreadType = unreadBadgeType }
                }.toMap()
            }.toMutableMap()
-        if (libraryMap.containsKey(0))
-            categories.add(0, createDefaultCategory())

        if (showCategories) {
            categories.forEach { category ->
-                if (!libraryMap.containsKey(category.id)) {
+                if (category.id ?: 0 <= 0 && !libraryMap.containsKey(category.id)) {
                    val headerItem =
                        LibraryHeaderItem({ getCategory(category.id!!) }, category.id!!)
                    libraryMap[category.id!!] = listOf(
@ -525,6 +521,9 @@ class LibraryPresenter(
            }
        }

+        if (libraryMap.containsKey(0))
+            categories.add(0, createDefaultCategory())
+
        if (categories.size == 1 && showCategories)
            categories.first().name = context.getString(R.string.label_library)

--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@ -145,12 +145,7 @@ open class MainActivity : BaseActivity(), DownloadServiceListener {
            val currentRoot = router.backstack.firstOrNull()
            if (currentRoot?.tag()?.toIntOrNull() != id) {
                when (id) {
-                    R.id.nav_library -> setRoot(
-                        if (preferences.libraryAsSingleList()
-                                .getOrDefault()
-                        ) LibraryListController()
-                        else LibraryController(), id
-                    )
+                    R.id.nav_library -> setRoot(LibraryListController(), id)
                    R.id.nav_recents -> {
                        setRoot(RecentsController(), id)
 //                        if (preferences.showRecentUpdates().getOrDefault()) setRoot(
@ -273,8 +268,8 @@ open class MainActivity : BaseActivity(), DownloadServiceListener {
            if (Migrations.upgrade(preferences)) {
                if (BuildConfig.DEBUG) {
                    MaterialDialog(this).title(text = "Welcome to the J2K MD2 Beta").message(
-                            text = "This beta is for testing the upcoming " + "release. Requests for new additions this beta will ignored (however" + " suggestions on how to better implement a feature in this beta are " + "welcome).\n\nFor any bugs you come across, there is a bug report " + "button in settings.\n\nAs a reminder this is a *BETA* build and bugs" + " may happen and features may be missing/not implemented yet." + "\n\nEnjoy and thanks for testing!"
-                        ).positiveButton(android.R.string.ok).cancelOnTouchOutside(false).show()
+                        text = "This beta is for testing the upcoming release. Requests for new additions for this beta will ignored (however suggestions on how to better implement a feature in this beta are welcome).\n\nFor any bugs you come across, there is a bug report button in settings.\n\nAs a reminder this is a *BETA* build; bugs may happen, features may be missing/not implemented yet, and screens can change.\n\nEnjoy and thanks for testing!"
+                    ).positiveButton(android.R.string.ok).cancelOnTouchOutside(false).show()
                } else ChangelogDialogController().showDialog(router)
            }
        }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
@ -1170,8 +1170,10 @@ class MangaDetailsController : BaseController,
     * Called to set the last used catalogue at the top of the view.
     */
    private fun addMangaHeader() {
-        adapter?.removeAllScrollableHeaders()
-        adapter?.addScrollableHeader(presenter.headerItem)
+        if (adapter?.scrollableHeaders?.isEmpty() == true) {
+            adapter?.removeAllScrollableHeaders()
+            adapter?.addScrollableHeader(presenter.headerItem)
+        }
    }

    private fun setStatusBarAndToolbar() {
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
@ -13,11 +13,9 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Target
-import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
-import eu.kanade.tachiyomi.ui.library.LibraryController
 import eu.kanade.tachiyomi.ui.library.LibraryListController
 import eu.kanade.tachiyomi.util.system.launchUI
 import eu.kanade.tachiyomi.util.system.toast
@ -156,10 +154,7 @@ class SettingsAdvancedController : SettingsController() {
    private fun clearDatabase() {
        // Avoid weird behavior by going back to the library.
        val newBackstack = listOf(RouterTransaction.with(
-            if (preferences.libraryAsSingleList().getOrDefault())
-                LibraryListController()
-            else
-                LibraryController())) +
+                LibraryListController())) +
                router.backstack.drop(1)

        router.setBackstack(newBackstack, FadeChangeHandler())
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
@ -29,13 +29,13 @@ class SettingsLibraryController : SettingsController() {
        titleRes = R.string.pref_category_library
        preferenceCategory {
            titleRes = R.string.pref_category_library_display
-
+            /*
            switchPreference {
                key = Keys.libraryAsSingleList
                titleRes = R.string.pref_library_single_list
                summaryRes = R.string.pref_library_single_list_summary
                defaultValue = false
-            }
+            }*/

            switchPreference {
                key = Keys.removeArticles
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -254,11 +254,11 @@

    <string name="pref_category_library_migration">Migration</string>
    <string name="pref_keep_category_sorting">Change category sorting when moving</string>
-    <string name="pref_keep_category_sorting_summary">In single list mode, should dragging and
+    <string name="pref_keep_category_sorting_summary">Should dragging and
        dropping an entry into a new category change the category\'s sorting to drag &amp;
        drop?</string>
    <string name="always_ask">Always ask</string>
-    <string name="option_keep_category_sort">Keep current sorting method</string>
+    <string name="option_keep_category_sort">Keep category\'s current sorting</string>
    <string name="option_switch_to_dnd">Switch to Drag &amp; Drop</string>


--- a/app/standard/debug/app-standard-debug.apk
+++ b/app/standard/debug/app-standard-debug.apk