From d9f5a97d561ebf6a2ca0994a9b7c763410731acd Mon Sep 17 00:00:00 2001
From: NoodleMage <bramvdkerkhof@gmail.com>
Date: Thu, 3 Mar 2016 23:56:57 +0100
Subject: [PATCH 1/4] Can now filter downloads only on library view. Fix #27

---
 .../data/preference/PreferencesHelper.kt      |   4 ++
 .../tachiyomi/ui/library/LibraryFragment.kt   |  48 ++++++++++++++++++
 .../tachiyomi/ui/library/LibraryPresenter.kt  |  29 +++++++++++
 .../ic_filter_list_white_24dp.png             | Bin 0 -> 111 bytes
 .../ic_filter_list_white_24dp.png             | Bin 0 -> 90 bytes
 .../ic_filter_list_white_24dp.png             | Bin 0 -> 103 bytes
 .../ic_filter_list_white_24dp.png             | Bin 0 -> 107 bytes
 .../ic_filter_list_white_24dp.png             | Bin 0 -> 106 bytes
 app/src/main/res/menu/library.xml             |  20 ++++++++
 app/src/main/res/values/keys.xml              |   1 +
 app/src/main/res/values/strings.xml           |   4 ++
 app/src/main/res/values/styles.xml            |   2 +-
 12 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index c5ee1cefc..34d355f34 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -182,4 +182,8 @@ class PreferencesHelper(private val context: Context) {
         return rxPrefs.getInteger(getKey(R.string.pref_library_update_interval_key), 0)
     }
 
+    fun filterDownloaded(): Preference<Boolean> {
+        return rxPrefs.getBoolean(getKey(R.string.pref_filter_downloaded), false)
+    }
+
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index 50950803b..1d02ca142 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -74,6 +74,17 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
      */
     private var selectedCoverManga: Manga? = null
 
+
+    /**
+     * TODO
+     */
+    var isFilterDownloaded = false
+
+    /**
+     * TODO
+     */
+    var isFilterUnread = false
+
     companion object {
         /**
          * Key to change the cover of a manga in [onActivityResult].
@@ -104,6 +115,7 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
+        isFilterDownloaded = presenter.preferences.filterDownloaded().get() as Boolean
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
@@ -116,6 +128,14 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
 
         appBar = (activity as MainActivity).appBar
         tabs = appBar.inflate(R.layout.library_tab_layout) as TabLayout
+
+        // Workaround to prevent: Tab belongs to a different TabLayout.
+        // Internal bug in Support library v23.2.0.
+        // See https://code.google.com/p/android/issues/detail?id=201827
+        for (j in 0..16) {
+            tabs.newTab()
+        }
+
         appBar.addView(tabs)
 
         adapter = LibraryAdapter(childFragmentManager)
@@ -144,6 +164,8 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         inflater.inflate(R.menu.library, menu)
 
         // Initialize search menu
+        val filterDownloadedItem = menu.findItem(R.id.action_filter_downloaded)
+        val filterUnreadItem = menu.findItem(R.id.action_filter_unread)
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.actionView as SearchView
 
@@ -153,6 +175,9 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
             searchView.clearFocus()
         }
 
+        filterDownloadedItem.isChecked = isFilterDownloaded;
+        filterUnreadItem.isChecked = isFilterUnread;
+
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 onSearchTextChange(query)
@@ -168,6 +193,25 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
+            R.id.action_filter_unread -> {
+                isFilterUnread = !isFilterUnread
+                activity.supportInvalidateOptionsMenu();
+                ToastUtil.showShort(context, "Filter Unread Clicked")
+            }
+            R.id.action_filter_downloaded -> {
+                isFilterDownloaded = !isFilterDownloaded
+                presenter.preferences.filterDownloaded().set(isFilterDownloaded)
+                presenter.updateLibrary()
+                adapter.notifyDataSetChanged()
+                activity.supportInvalidateOptionsMenu();
+                ToastUtil.showShort(context, "Filter Download Clicked")
+            }
+            R.id.action_filter_empty -> {
+                isFilterUnread = false
+                isFilterDownloaded = false
+                activity.supportInvalidateOptionsMenu();
+                ToastUtil.showShort(context, "Filter Clear Clicked")
+            }
             R.id.action_refresh -> LibraryUpdateService.start(activity)
             R.id.action_edit_categories -> {
                 val intent = CategoryActivity.newIntent(activity)
@@ -211,6 +255,10 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         // Restore active category.
         view_pager.setCurrentItem(activeCat, false)
         if (tabs.tabCount > 0) {
+            // Prevent IndexOutOfBoundsException
+            if (tabs.tabCount <= view_pager.currentItem) {
+                view_pager.currentItem = (tabs.tabCount - 1)
+            }
             tabs.getTabAt(view_pager.currentItem)?.select()
         }
 
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 23269398f..3af88d47e 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
@@ -5,8 +5,10 @@ import android.util.Pair
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
+import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.source.SourceManager
 import eu.kanade.tachiyomi.event.LibraryMangasEvent
@@ -35,6 +37,8 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
      */
     lateinit var selectedMangas: MutableList<Manga>
 
+    lateinit var libraryFragment: LibraryFragment
+
     /**
      * Search query of the library.
      */
@@ -91,6 +95,7 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
 
     override fun onTakeView(libraryFragment: LibraryFragment) {
         super.onTakeView(libraryFragment)
+        this.libraryFragment = libraryFragment
         if (isUnsubscribed(GET_LIBRARY)) {
             start(GET_LIBRARY)
         }
@@ -107,6 +112,10 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
                 .observeOn(AndroidSchedulers.mainThread())
     }
 
+    fun updateLibrary() {
+        start(GET_LIBRARY)
+    }
+
     /**
      * Get the categories from the database.
      *
@@ -126,12 +135,32 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
     fun getLibraryMangasObservable(): Observable<Map<Int, List<Manga>>> {
         return db.libraryMangas.asRxObservable()
                 .flatMap { mangas -> Observable.from(mangas)
+                        .filter {
+                            if (preferences.filterDownloaded().get() as Boolean) {
+                                val downloadManager = DownloadManager(context, sourceManager, preferences)
+
+                                val chapters = getChapters(it)
+
+                                var hasDownloaded = false
+                                chapters?.forEach { chapter ->
+                                    if (downloadManager.isChapterDownloaded(sourceManager.get(it.source), it, chapter)) {
+                                        hasDownloaded = true
+                                    }
+                                }
+                                hasDownloaded
+                            } else
+                                true
+                        }
                         .groupBy { it.category }
                         .flatMap { group -> group.toList().map { Pair(group.key, it) } }
                         .toMap({ it.first }, { it.second })
                 }
     }
 
+    fun getChapters(manga: Manga): MutableList<Chapter>? {
+        return db.getChapters(manga).executeAsBlocking()
+    }
+
     /**
      * Called when a manga is opened.
      */
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e8a6b536bdfcba999ba36bfdba7ca975fd7b68c
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;nWu|mh)3t!ix)W=3^<qr-OoRJ
z$q}j<^l;vP_JbS`+^1P@QE1_MUAHsfP{E6<CRe7|Z&hbGW3@uv^`7&x^O8Ul7(8A5
KT-G@yGywoi0V8q%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..59a2ec755e90e6be335d3d6c79ede6d85a7ed488
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1MNb#U5R22v2@<R>&Hr5(PMPpn
nt`GJ<EbzhRtw|4)2?N98FYT3kUa!~=RLtP%>gTe~DWM4fp6nTa

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9416c70ec0a0a230648075ebc449e2000f239d72
GIT binary patch
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tJx>?Mkcif|mkfCs7&s0X{F%+h
z&%)%Mop4@>VctnaroRklqT+)Y_}1iWG8C+2XgDPM|LJEjE1*sWPgg&ebxsLQ0G~@6
Ar~m)}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1263ae82e71dfbfd5aba9a11483442542e74ce15
GIT binary patch
literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc`BYRjv*C{
z$r6(m{IloyqulHooWQ^35x=C46!WwH>?aa<eHj>9)4kR*{W|XsGR4!?&t;ucLK6Tv
CS{)|<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb2207f11fb53879554df5541522fa4ee564e975
GIT binary patch
literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@{~PY978G?
zlNE$}nEw3__|Q0Q&OttfcS{V@Ia-)>EuS<8GB8}PYOf6O+;0yu#M9N!Wt~$(6988y
B9v1)r

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index 29639aa09..02037e002 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -2,6 +2,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
 
+    <item
+        android:id="@+id/action_filter"
+        android:title="@string/action_filter"
+        android:icon="@drawable/ic_filter_list_white_24dp"
+        app:showAsAction="ifRoom">
+        <menu>
+            <item
+                android:id="@+id/action_filter_downloaded"
+                android:checkable="true"
+                android:title="@string/action_filter_downloaded"/>
+            <item
+                android:id="@+id/action_filter_unread"
+                android:checkable="true"
+                android:title="@string/action_filter_unread"/>
+            <item
+                android:id="@+id/action_filter_empty"
+                android:title="@string/action_filter_empty"/>
+        </menu>
+    </item>
+
     <item
         android:id="@+id/action_search"
         android:title="@string/action_search"
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index c89ef298a..cd9d1d73e 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -28,6 +28,7 @@
     <string name="pref_reader_theme_key">pref_reader_theme_key</string>
     <string name="pref_image_decoder_key">pref_image_decoder_key</string>
     <string name="pref_seamless_mode_key">pref_seamless_mode_key</string>
+    <string name="pref_filter_downloaded">pref_filter_downloaded</string>
 
     <string name="pref_download_directory_key">pref_download_directory_key</string>
     <string name="pref_download_slots_key">pref_download_slots_key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4c231ec3..fb6210728 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,10 @@
 
     <!-- Actions -->
     <string name="action_settings">Settings</string>
+    <string name="action_filter">Filter</string>
+    <string name="action_filter_downloaded">Downloaded</string>
+    <string name="action_filter_unread">Unread</string>
+    <string name="action_filter_empty">Remove filter</string>
     <string name="action_search">Search</string>
     <string name="action_refresh">Refresh</string>
     <string name="action_select_all">Select all</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a86901edf..6023805e5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@
         <item name="actionModeBackground">@color/colorPrimarySuperDark</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
-        <item name="colorAccent">@color/white</item>
+        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
     <style name="AppTheme.Overlay.Dark" parent="ThemeOverlay.AppCompat.Dark.ActionBar">

From 8fbef4b4bb5145cd2b1305d177869ee2408cc411 Mon Sep 17 00:00:00 2001
From: NoodleMage <bramvdkerkhof@gmail.com>
Date: Fri, 4 Mar 2016 18:45:58 +0100
Subject: [PATCH 2/4] Can now filter unread manga + Code opt

---
 .../data/preference/PreferencesHelper.kt      |  4 +
 .../tachiyomi/ui/library/LibraryFragment.kt   | 35 ++++++--
 .../tachiyomi/ui/library/LibraryPresenter.kt  | 89 ++++++++++++++-----
 app/src/main/res/values/keys.xml              |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 99 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 34d355f34..05d1d7abd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -186,4 +186,8 @@ class PreferencesHelper(private val context: Context) {
         return rxPrefs.getBoolean(getKey(R.string.pref_filter_downloaded), false)
     }
 
+    fun filterUnread(): Preference<Boolean> {
+        return rxPrefs.getBoolean(getKey(R.string.pref_filter_unread), false)
+    }
+
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index 1d02ca142..928854455 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -116,6 +116,7 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
         isFilterDownloaded = presenter.preferences.filterDownloaded().get() as Boolean
+        isFilterUnread = presenter.preferences.filterUnread().get() as Boolean
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
@@ -194,23 +195,30 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_filter_unread -> {
+                // Change unread filter status.
                 isFilterUnread = !isFilterUnread
-                activity.supportInvalidateOptionsMenu();
-                ToastUtil.showShort(context, "Filter Unread Clicked")
+                // Update settings.
+                presenter.preferences.filterUnread().set(isFilterUnread)
+                // Apply filter.
+                onFilterCheckboxChanged()
             }
             R.id.action_filter_downloaded -> {
+                // Change downloaded filter status.
                 isFilterDownloaded = !isFilterDownloaded
+                // Update settings.
                 presenter.preferences.filterDownloaded().set(isFilterDownloaded)
-                presenter.updateLibrary()
-                adapter.notifyDataSetChanged()
-                activity.supportInvalidateOptionsMenu();
-                ToastUtil.showShort(context, "Filter Download Clicked")
+                // Apply filter.
+                onFilterCheckboxChanged()
             }
             R.id.action_filter_empty -> {
+                // Remove filter status.
                 isFilterUnread = false
                 isFilterDownloaded = false
-                activity.supportInvalidateOptionsMenu();
-                ToastUtil.showShort(context, "Filter Clear Clicked")
+                // Update settings.
+                presenter.preferences.filterUnread().set(isFilterUnread)
+                presenter.preferences.filterDownloaded().set(isFilterDownloaded)
+                // Apply filter
+                onFilterCheckboxChanged()
             }
             R.id.action_refresh -> LibraryUpdateService.start(activity)
             R.id.action_edit_categories -> {
@@ -223,6 +231,17 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         return true
     }
 
+    /**
+     * Applies filter change
+     */
+    private fun onFilterCheckboxChanged() {
+        presenter.updateLibrary()
+        adapter.notifyDataSetChanged()
+        adapter.refreshRegisteredAdapters()
+        activity.supportInvalidateOptionsMenu();
+        ToastUtil.showShort(context, getString(R.string.library_filter_change))
+    }
+
     /**
      * Updates the query.
      *
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 3af88d47e..ea4633632 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
@@ -37,8 +37,6 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
      */
     lateinit var selectedMangas: MutableList<Manga>
 
-    lateinit var libraryFragment: LibraryFragment
-
     /**
      * Search query of the library.
      */
@@ -95,7 +93,6 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
 
     override fun onTakeView(libraryFragment: LibraryFragment) {
         super.onTakeView(libraryFragment)
-        this.libraryFragment = libraryFragment
         if (isUnsubscribed(GET_LIBRARY)) {
             start(GET_LIBRARY)
         }
@@ -112,6 +109,9 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
                 .observeOn(AndroidSchedulers.mainThread())
     }
 
+    /**
+     * Update the library information
+     */
     fun updateLibrary() {
         start(GET_LIBRARY)
     }
@@ -134,29 +134,72 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
      */
     fun getLibraryMangasObservable(): Observable<Map<Int, List<Manga>>> {
         return db.libraryMangas.asRxObservable()
-                .flatMap { mangas -> Observable.from(mangas)
-                        .filter {
-                            if (preferences.filterDownloaded().get() as Boolean) {
-                                val downloadManager = DownloadManager(context, sourceManager, preferences)
-
-                                val chapters = getChapters(it)
-
-                                var hasDownloaded = false
-                                chapters?.forEach { chapter ->
-                                    if (downloadManager.isChapterDownloaded(sourceManager.get(it.source), it, chapter)) {
-                                        hasDownloaded = true
-                                    }
-                                }
-                                hasDownloaded
-                            } else
-                                true
-                        }
-                        .groupBy { it.category }
-                        .flatMap { group -> group.toList().map { Pair(group.key, it) } }
-                        .toMap({ it.first }, { it.second })
+                .flatMap { mangas ->
+                    Observable.from(mangas)
+                            .filter {
+                                // Filter library by options
+                                filterLibrary(it)
+                            }
+                            .groupBy { it.category }
+                            .flatMap { group -> group.toList().map { Pair(group.key, it) } }
+                            .toMap({ it.first }, { it.second })
                 }
     }
 
+    /**
+     * Filter library by preference
+     *
+     * @param manga from library
+     * @return filter status
+     */
+    fun filterLibrary(manga: Manga): Boolean {
+        // Check if filter option is selected
+        if (preferences.filterDownloaded().get() as Boolean || preferences.filterUnread().get() as Boolean) {
+
+            // Does it have downloaded chapters.
+            var hasDownloaded = false
+
+            // Does it have unread chapters.
+            var hasUnread = false
+
+            // Get chapters from database.
+            val chapters = getChapters(manga)
+
+            if (preferences.filterDownloaded().get() as Boolean) {
+                // Get download manager.
+                val downloadManager = DownloadManager(context, sourceManager, preferences)
+                // Loop through chapters and check if library has downloaded manga
+                chapters?.forEach { chapter ->
+                    if (downloadManager.isChapterDownloaded(sourceManager.get(manga.source), manga, chapter)) {
+                        hasDownloaded = true
+                    }
+                }
+            }
+            if (preferences.filterUnread().get() as Boolean) {
+                // Loop through chapters and check if library has unread manga
+                chapters?.forEach { chapter ->
+                    if (!chapter.read) {
+                        hasUnread = true
+                    }
+                }
+            }
+
+            // Return correct filter status
+            if (preferences.filterDownloaded().get() as Boolean && preferences.filterUnread().get() as Boolean) {
+                return (hasDownloaded && hasUnread)
+            } else {
+                return (hasDownloaded || hasUnread)
+            }
+        } else
+            return true
+    }
+
+    /**
+     * Returns list of chapters belonging to manga
+     *
+     * @param manga manga from library
+     * @return list of chapters belonging to manga
+     */
     fun getChapters(manga: Manga): MutableList<Chapter>? {
         return db.getChapters(manga).executeAsBlocking()
     }
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index cd9d1d73e..b1a061281 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -29,6 +29,7 @@
     <string name="pref_image_decoder_key">pref_image_decoder_key</string>
     <string name="pref_seamless_mode_key">pref_seamless_mode_key</string>
     <string name="pref_filter_downloaded">pref_filter_downloaded</string>
+    <string name="pref_filter_unread">pref_filter_unread</string>
 
     <string name="pref_download_directory_key">pref_download_directory_key</string>
     <string name="pref_download_slots_key">pref_download_slots_key</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb6210728..cd3d342f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,6 +162,7 @@
     <!-- Library fragment -->
     <string name="library_search_hint">Title or author…</string>
     <string name="library_selection_title">Selected</string>
+    <string name="library_filter_change">Filtering…</string>
 
     <!-- Catalogue fragment -->
     <string name="source_requires_login">This source requires you to log in</string>

From b89d6644d869112c4665367631a5b6edcb5c358b Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Sun, 6 Mar 2016 15:31:21 +0100
Subject: [PATCH 3/4] Performance improvements for library filters

---
 .../data/download/DownloadManager.java        | 14 +++--
 .../data/preference/PreferencesHelper.kt      |  4 ++
 .../tachiyomi/ui/library/LibraryPresenter.kt  | 54 ++++++++-----------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java
index 713c05503..f182f2e4f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java
@@ -378,17 +378,21 @@ public class DownloadManager {
         savePageList(download.source, download.manga, download.chapter, download.pages);
     }
 
-    // Get the absolute path to the chapter directory
-    public File getAbsoluteChapterDirectory(Source source, Manga manga, Chapter chapter) {
+    public File getAbsoluteMangaDirectory(Source source, Manga manga) {
         String chapterRelativePath = source.getName() +
                 File.separator +
-                manga.title.replaceAll("[^\\sa-zA-Z0-9.-]", "_") +
-                File.separator +
-                chapter.name.replaceAll("[^\\sa-zA-Z0-9.-]", "_");
+                manga.title.replaceAll("[^\\sa-zA-Z0-9.-]", "_");
 
         return new File(preferences.getDownloadsDirectory(), chapterRelativePath);
     }
 
+    // Get the absolute path to the chapter directory
+    public File getAbsoluteChapterDirectory(Source source, Manga manga, Chapter chapter) {
+        String chapterRelativePath = chapter.name.replaceAll("[^\\sa-zA-Z0-9.-]", "_");
+
+        return new File(getAbsoluteMangaDirectory(source, manga), chapterRelativePath);
+    }
+
     // Shortcut for the method above
     private File getAbsoluteChapterDirectory(Download download) {
         return getAbsoluteChapterDirectory(download.source, download.manga, download.chapter);
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 05d1d7abd..c5adab461 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -11,6 +11,10 @@ import eu.kanade.tachiyomi.data.source.base.Source
 import java.io.File
 import java.io.IOException
 
+fun <T> Preference<T>.getOrDefault(): T {
+    return get() ?: defaultValue()!!
+}
+
 class PreferencesHelper(private val context: Context) {
 
     private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
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 ea4633632..6bc038d23 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
@@ -5,11 +5,11 @@ import android.util.Pair
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
-import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.data.source.SourceManager
 import eu.kanade.tachiyomi.event.LibraryMangasEvent
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
@@ -62,6 +62,11 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
      */
     @Inject lateinit var sourceManager: SourceManager
 
+    /**
+     * Download manager.
+     */
+    @Inject lateinit var downloadManager: DownloadManager
+
     companion object {
         /**
          * Id of the restartable that listens for library updates.
@@ -153,55 +158,40 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
      * @return filter status
      */
     fun filterLibrary(manga: Manga): Boolean {
+        val prefFilterDownloaded = preferences.filterDownloaded().getOrDefault()
+        val prefFilterUnread = preferences.filterUnread().getOrDefault()
+
         // Check if filter option is selected
-        if (preferences.filterDownloaded().get() as Boolean || preferences.filterUnread().get() as Boolean) {
+        if (prefFilterDownloaded || prefFilterUnread) {
 
             // Does it have downloaded chapters.
             var hasDownloaded = false
 
             // Does it have unread chapters.
-            var hasUnread = false
+            val hasUnread = manga.unread > 0
 
-            // Get chapters from database.
-            val chapters = getChapters(manga)
+            if (prefFilterDownloaded) {
+                val mangaDir = downloadManager.getAbsoluteMangaDirectory(sourceManager.get(manga.source), manga)
 
-            if (preferences.filterDownloaded().get() as Boolean) {
-                // Get download manager.
-                val downloadManager = DownloadManager(context, sourceManager, preferences)
-                // Loop through chapters and check if library has downloaded manga
-                chapters?.forEach { chapter ->
-                    if (downloadManager.isChapterDownloaded(sourceManager.get(manga.source), manga, chapter)) {
-                        hasDownloaded = true
-                    }
-                }
-            }
-            if (preferences.filterUnread().get() as Boolean) {
-                // Loop through chapters and check if library has unread manga
-                chapters?.forEach { chapter ->
-                    if (!chapter.read) {
-                        hasUnread = true
+                if (mangaDir.exists()) {
+                    for (file in mangaDir.listFiles()) {
+                        if (file.isDirectory && file.listFiles().isNotEmpty()) {
+                            hasDownloaded = true
+                            break
+                        }
                     }
                 }
             }
 
             // Return correct filter status
-            if (preferences.filterDownloaded().get() as Boolean && preferences.filterUnread().get() as Boolean) {
+            if (prefFilterDownloaded && prefFilterUnread) {
                 return (hasDownloaded && hasUnread)
             } else {
                 return (hasDownloaded || hasUnread)
             }
-        } else
+        } else {
             return true
-    }
-
-    /**
-     * Returns list of chapters belonging to manga
-     *
-     * @param manga manga from library
-     * @return list of chapters belonging to manga
-     */
-    fun getChapters(manga: Manga): MutableList<Chapter>? {
-        return db.getChapters(manga).executeAsBlocking()
+        }
     }
 
     /**

From 6383a745ff0da0f44e0fec76d2a40422d7d0fb0b Mon Sep 17 00:00:00 2001
From: NoodleMage <bramvdkerkhof@gmail.com>
Date: Sun, 6 Mar 2016 21:44:21 +0100
Subject: [PATCH 4/4] Fixed wrong download filter from commit #33386e2 Fixed
 another tab not in TabLayout error.

Drawable to Vector
Removed Filter... Toast
---
 .../tachiyomi/ui/library/LibraryFragment.kt       |   1 -
 .../tachiyomi/ui/library/LibraryPresenter.kt      |   7 +++++--
 .../kanade/tachiyomi/ui/manga/MangaActivity.java  |   7 +++++++
 .../drawable-hdpi/ic_filter_list_white_24dp.png   | Bin 111 -> 0 bytes
 .../drawable-mdpi/ic_filter_list_white_24dp.png   | Bin 90 -> 0 bytes
 .../drawable-xhdpi/ic_filter_list_white_24dp.png  | Bin 103 -> 0 bytes
 .../drawable-xxhdpi/ic_filter_list_white_24dp.png | Bin 107 -> 0 bytes
 .../ic_filter_list_white_24dp.png                 | Bin 106 -> 0 bytes
 app/src/main/res/drawable/ic_filter_list.xml      |   9 +++++++++
 app/src/main/res/menu/library.xml                 |   2 +-
 app/src/main/res/values/strings.xml               |   1 -
 11 files changed, 22 insertions(+), 5 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
 create mode 100644 app/src/main/res/drawable/ic_filter_list.xml

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
index 928854455..7a0403920 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
@@ -239,7 +239,6 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
         adapter.notifyDataSetChanged()
         adapter.refreshRegisteredAdapters()
         activity.supportInvalidateOptionsMenu();
-        ToastUtil.showShort(context, getString(R.string.library_filter_change))
     }
 
     /**
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 6bc038d23..7e0bf1bf6 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
@@ -166,9 +166,12 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
 
             // Does it have downloaded chapters.
             var hasDownloaded = false
+            var hasUnread = false
 
-            // Does it have unread chapters.
-            val hasUnread = manga.unread > 0
+            if (prefFilterUnread) {
+                // Does it have unread chapters.
+                hasUnread = manga.unread > 0
+            }
 
             if (prefFilterDownloaded) {
                 val mangaDir = downloadManager.getAbsoluteMangaDirectory(sourceManager.get(manga.source), manga)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
index a488a4cb2..d357b0503 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java
@@ -77,6 +77,13 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
         adapter = new MangaDetailAdapter(getSupportFragmentManager(), this);
 
         viewPager.setAdapter(adapter);
+
+        // Workaround to prevent: Tab belongs to a different TabLayout.
+        // Internal bug in Support library v23.2.0.
+        // See https://code.google.com/p/android/issues/detail?id=201827
+        for (int j = 0; j < 17; j++)
+            tabs.newTab();
+
         tabs.setupWithViewPager(viewPager);
 
         if (!isOnline)
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 7e8a6b536bdfcba999ba36bfdba7ca975fd7b68c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;nWu|mh)3t!ix)W=3^<qr-OoRJ
z$q}j<^l;vP_JbS`+^1P@QE1_MUAHsfP{E6<CRe7|Z&hbGW3@uv^`7&x^O8Ul7(8A5
KT-G@yGywoi0V8q%

diff --git a/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 59a2ec755e90e6be335d3d6c79ede6d85a7ed488..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1MNb#U5R22v2@<R>&Hr5(PMPpn
nt`GJ<EbzhRtw|4)2?N98FYT3kUa!~=RLtP%>gTe~DWM4fp6nTa

diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 9416c70ec0a0a230648075ebc449e2000f239d72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tJx>?Mkcif|mkfCs7&s0X{F%+h
z&%)%Mop4@>VctnaroRklqT+)Y_}1iWG8C+2XgDPM|LJEjE1*sWPgg&ebxsLQ0G~@6
Ar~m)}

diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index 1263ae82e71dfbfd5aba9a11483442542e74ce15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc`BYRjv*C{
z$r6(m{IloyqulHooWQ^35x=C46!WwH>?aa<eHj>9)4kR*{W|XsGR4!?&t;ucLK6Tv
CS{)|<

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
deleted file mode 100644
index cb2207f11fb53879554df5541522fa4ee564e975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@{~PY978G?
zlNE$}nEw3__|Q0Q&OttfcS{V@Ia-)>EuS<8GB8}PYOf6O+;0yu#M9N!Wt~$(6988y
B9v1)r

diff --git a/app/src/main/res/drawable/ic_filter_list.xml b/app/src/main/res/drawable/ic_filter_list.xml
new file mode 100644
index 000000000..7d435fa2b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_list.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/app/src/main/res/menu/library.xml b/app/src/main/res/menu/library.xml
index 02037e002..474a8f912 100644
--- a/app/src/main/res/menu/library.xml
+++ b/app/src/main/res/menu/library.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_filter"
         android:title="@string/action_filter"
-        android:icon="@drawable/ic_filter_list_white_24dp"
+        android:icon="@drawable/ic_filter_list"
         app:showAsAction="ifRoom">
         <menu>
             <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd3d342f3..fb6210728 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,7 +162,6 @@
     <!-- Library fragment -->
     <string name="library_search_hint">Title or author…</string>
     <string name="library_selection_title">Selected</string>
-    <string name="library_filter_change">Filtering…</string>
 
     <!-- Catalogue fragment -->
     <string name="source_requires_login">This source requires you to log in</string>