diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index eafbc4124f..e9c868c1d0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -31,7 +31,6 @@ import eu.kanade.tachiyomi.util.chapter.ChapterFilter import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.system.ImageUtil -import eu.kanade.tachiyomi.util.manga.MangaShortcutManager import eu.kanade.tachiyomi.util.system.executeOnIO import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -58,8 +57,7 @@ class ReaderPresenter( private val downloadManager: DownloadManager = Injekt.get(), private val coverCache: CoverCache = Injekt.get(), private val preferences: PreferencesHelper = Injekt.get(), - private val chapterFilter: ChapterFilter = Injekt.get(), - private val mangaShortcutManager: MangaShortcutManager = Injekt.get() + private val chapterFilter: ChapterFilter = Injekt.get() ) : BasePresenter() { /** @@ -155,7 +153,6 @@ class ReaderPresenter( saveChapterProgress(currentChapters.currChapter) saveChapterHistory(currentChapters.currChapter) } - mangaShortcutManager.updateShortcuts() } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index 6820bb5dd3..9f4b8d4f0a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -28,6 +28,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.databinding.BrowseControllerBinding import eu.kanade.tachiyomi.source.CatalogueSource +import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.ui.base.controller.BaseController import eu.kanade.tachiyomi.ui.extension.SettingsExtensionsController @@ -440,11 +441,15 @@ class BrowseController : */ private fun openCatalogue(source: CatalogueSource, controller: BrowseSourceController) { preferences.lastUsedCatalogueSource().set(source.id) - val list = preferences.lastUsedSources().get().toMutableSet() - list.removeAll { it.startsWith("${source.id}:") } - list.add("${source.id}:${Date().time}") - val sortedList = list.filter { it.split(":").size == 2 }.sortedByDescending { it.split(":").last().toLong() } - preferences.lastUsedSources().set(sortedList.subList(0, min(sortedList.size, 2)).toSet()) + if (source !is LocalSource) { + val list = preferences.lastUsedSources().get().toMutableSet() + list.removeAll { it.startsWith("${source.id}:") } + list.add("${source.id}:${Date().time}") + val sortedList = list.filter { it.split(":").size == 2 } + .sortedByDescending { it.split(":").last().toLong() } + preferences.lastUsedSources() + .set(sortedList.subList(0, min(sortedList.size, 2)).toSet()) + } router.pushController(controller.withFadeTransaction()) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt index c85dcbcea6..694a956363 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt @@ -91,7 +91,10 @@ class MangaShortcutManager( null } - ShortcutInfo.Builder(context, "Manga-${item.id?.toString() ?: item.title}") + ShortcutInfo.Builder( + context, + "Manga-${item.id?.toString() ?: item.title}" + ) .setShortLabel(item.title) .setLongLabel(item.title) .setIcon( @@ -124,7 +127,12 @@ class MangaShortcutManager( } else { Icon.createWithBitmap(bitmap) } - else Icon.createWithResource(context, R.drawable.ic_extension_update_24dp) + else { + Icon.createWithResource( + context, + R.drawable.sc_extensions_48dp + ) + } ) .setIntent( Intent( diff --git a/app/src/main/res/drawable/ic_book_24dp.xml b/app/src/main/res/drawable/ic_book_24dp.xml index b98b4c1b96..3673c8da9c 100644 --- a/app/src/main/res/drawable/ic_book_24dp.xml +++ b/app/src/main/res/drawable/ic_book_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/actionBarTintColor"> + android:tint="?attr/colorAccent">