Release 0.1.3

CONTRIBUTING.md

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Bugs
+* Include version (Setting > About > Version)
+ * If not latest, try updating, it may have already been solved
+ * Debug version is equal to the number of commits as seen in the main page
+* Include steps to reproduce (if not obvious from description)
+* Include screenshot (if needed)
+* If it could be device-dependent, try reproducing on another device (if possible),  include results and device names, OS, modifications (root, Xposed)
+* **Before reporting a new issue, take a look at the [FAQ](https://github.com/inorichi/tachiyomi/wiki/FAQ), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened [issues](https://github.com/inorichi/tachiyomi/issues).**
+* For large logs use http://pastebin.com/ (or similar)
+* For multipart issues use list like this:
+ * [x] Done
+ * [ ] Not done
+```
+* [x] Done
+* [ ] Not done
+```
+
+DO: https://github.com/inorichi/tachiyomi/issues/24 https://github.com/inorichi/tachiyomi/issues/71
+
+DON'T: https://github.com/inorichi/tachiyomi/issues/75
+
+# Feature requests
+
+* Write a detailed issue, explaning what it should do or how. Avoid writing just "like X app does"
+* Include screenshot (if needed)
+
+# Translations
+
+File `app/src/main/res/values/strings.xml` should be copied over to appropriate directories and then translated.
+Consult [Android.com](http://developer.android.com/training/basics/supporting-devices/languages.html#CreateDirs)

README.md

@@ -1,8 +1,14 @@
+[![stable release](https://img.shields.io/badge/release-v0.1.2-blue.svg)](https://github.com/inorichi/tachiyomi/releases)
+[![fdroid release](https://img.shields.io/badge/release-F--Droid-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi)
+[![latest debug build](https://img.shields.io/badge/debug-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk)
+
 Tachiyomi is a free and open source manga reader for Android.
 
 Keep in mind it's still a beta, so expect it to crash sometimes.
 
-Current features:
+Before reporting a new issue, take a look at the [FAQ](https://github.com/inorichi/tachiyomi/wiki/FAQ), the [changelog](https://github.com/inorichi/tachiyomi/releases) and the already opened issues.
+
+## Features
 
 * Online and offline reading
 * Configurable reader with multiple viewers and settings
@@ -12,11 +18,6 @@ Current features:
 * Schedule searching for updates
 * Categories to organize your library
 
-## Download
-
-[![stable release](https://img.shields.io/badge/release-v0.1.0-blue.svg)](https://github.com/inorichi/tachiyomi/releases/download/v0.1.0/tachiyomi-v0.1.0.apk)
-[![latest debug build](https://img.shields.io/badge/debug-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk)
-
 ## License
 
     Copyright 2015 Javier Tomás

app/build.gradle

@@ -39,8 +39,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 2
+        versionCode 4
-        versionName "0.1.1"
+        versionName "0.1.3"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -73,6 +73,7 @@ android {
 
     lintOptions {
         abortOnError false
+        checkReleaseBuilds false
     }
 
 }
@@ -80,6 +81,7 @@ android {
 dependencies {
     final SUPPORT_LIBRARY_VERSION = '23.1.1'
     final DAGGER_VERSION = '2.0.2'
+    final OKHTTP_VERSION = '3.0.1'
     final MOCKITO_VERSION = '1.10.19'
     final STORIO_VERSION = '1.8.0'
     final ICEPICK_VERSION = '3.1.0'
@@ -93,8 +95,9 @@ dependencies {
     compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.7.2'
+    compile "com.android.support:percent:$SUPPORT_LIBRARY_VERSION"
-    compile 'com.squareup.okhttp:okhttp:2.7.2'
+    compile "com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"
+    compile "com.squareup.okhttp3:okhttp-urlconnection:$OKHTTP_VERSION"
     compile 'com.squareup.okio:okio:1.6.0'
     compile 'com.google.code.gson:gson:2.5'
     compile 'com.jakewharton:disklrucache:2.0.2'
@@ -114,9 +117,9 @@ dependencies {
     compile "frankiesardo:icepick:$ICEPICK_VERSION"
     provided "frankiesardo:icepick-processor:$ICEPICK_VERSION"
     compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    compile 'eu.davidea:flexible-adapter:4.2.0@aar'
+    compile 'eu.davidea:flexible-adapter:4.2.0'
     compile 'com.nononsenseapps:filepicker:2.5.1'
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    compile 'com.github.amulyakhare:TextDrawable:558677e'
     compile 'com.github.pwittchen:reactivenetwork:0.1.5'
 
     compile "com.google.dagger:dagger:$DAGGER_VERSION"
@@ -127,10 +130,15 @@ dependencies {
     compile('com.mikepenz:materialdrawer:4.6.4@aar') {
         transitive = true
     }
+
+    //Google material icons SVG.
+    compile 'com.mikepenz:google-material-typeface:2.1.0.1.original@aar'
+
     compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
         transitive = true
     }
 
+
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:2.3.0'
     testCompile "org.mockito:mockito-core:$MOCKITO_VERSION"

app/proguard-rules.pro

@@ -8,9 +8,9 @@
 # OkHttp
 -keepattributes Signature
 -keepattributes *Annotation*
--keep class com.squareup.okhttp.** { *; }
+-keep class okhttp3.** { *; }
--keep interface com.squareup.okhttp.** { *; }
+-keep interface okhttp3.** { *; }
--dontwarn com.squareup.okhttp.**
+-dontwarn okhttp3.**
 -dontwarn okio.**
 
 # Okio

app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.java

@@ -6,7 +6,6 @@ import android.text.format.Formatter;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.jakewharton.disklrucache.DiskLruCache;
-import com.squareup.okhttp.Response;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -17,26 +16,54 @@ import java.util.List;
 
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.util.DiskUtils;
+import okhttp3.Response;
 import okio.BufferedSink;
 import okio.Okio;
 import rx.Observable;
 
+/**
+ * Class used to create chapter cache
+ * For each image in a chapter a file is created
+ * For each chapter a Json list is created and converted to a file.
+ * The files are in format *md5key*.0
+ */
 public class ChapterCache {
 
+    /** Name of cache directory. */
     private static final String PARAMETER_CACHE_DIRECTORY = "chapter_disk_cache";
+
+    /** Application cache version. */
     private static final int PARAMETER_APP_VERSION = 1;
+
+    /** The number of values per cache entry. Must be positive. */
     private static final int PARAMETER_VALUE_COUNT = 1;
+
+    /** The maximum number of bytes this cache should use to store. */
     private static final int PARAMETER_CACHE_SIZE = 75 * 1024 * 1024;
 
-    private Context context;
+    /** Interface to global information about an application environment. */
-    private Gson gson;
+    private final Context context;
 
+    /** Google Json class used for parsing JSON files. */
+    private final Gson gson;
+
+    /** Cache class used for cache management. */
     private DiskLruCache diskCache;
 
+    /** Page list collection used for deserializing from JSON. */
+    private final Type pageListCollection;
+
+    /**
+     * Constructor of ChapterCache.
+     * @param context application environment interface.
+     */
     public ChapterCache(Context context) {
         this.context = context;
+
+        // Initialize Json handler.
         gson = new Gson();
 
+        // Try to open cache in default cache directory.
         try {
             diskCache = DiskLruCache.open(
                     new File(context.getCacheDir(), PARAMETER_CACHE_DIRECTORY),
@@ -47,80 +74,104 @@ public class ChapterCache {
         } catch (IOException e) {
             // Do Nothing.
         }
+
+        pageListCollection = new TypeToken<List<Page>>() {}.getType();
     }
 
-    public boolean remove(String file) {
+    /**
+     * Returns directory of cache.
+     * @return directory of cache.
+     */
+    public File getCacheDir() {
+        return diskCache.getDirectory();
+    }
+
+    /**
+     * Returns real size of directory.
+     * @return real size of directory.
+     */
+    private long getRealSize() {
+        return DiskUtils.getDirectorySize(getCacheDir());
+    }
+
+    /**
+     * Returns real size of directory in human readable format.
+     * @return real size of directory.
+     */
+    public String getReadableSize() {
+        return Formatter.formatFileSize(context, getRealSize());
+    }
+
+    /**
+     * Remove file from cache.
+     * @param file name of file "md5.0".
+     * @return status of deletion for the file.
+     */
+    public boolean removeFileFromCache(String file) {
+        // Make sure we don't delete the journal file (keeps track of cache).
         if (file.equals("journal") || file.startsWith("journal."))
             return false;
 
         try {
+            // Remove the extension from the file to get the key of the cache
             String key = file.substring(0, file.lastIndexOf("."));
+            // Remove file from cache.
             return diskCache.remove(key);
         } catch (IOException e) {
             return false;
         }
     }
 
-    public File getCacheDir() {
+    /**
-        return diskCache.getDirectory();
+     * Get page list from cache.
-    }
+     * @param chapterUrl the url of the chapter.
-
+     * @return an observable of the list of pages.
-    public long getRealSize() {
+     */
-        return DiskUtils.getDirectorySize(getCacheDir());
+    public Observable<List<Page>> getPageListFromCache(final String chapterUrl) {
-    }
+        return Observable.fromCallable(() -> {
-
+            // Initialize snapshot (a snapshot of the values for an entry).
-    public String getReadableSize() {
-        return Formatter.formatFileSize(context, getRealSize());
-    }
-
-    public void setSize(int value) {
-        diskCache.setMaxSize(value * 1024 * 1024);
-    }
-
-    public Observable<List<Page>> getPageUrlsFromDiskCache(final String chapterUrl) {
-        return Observable.create(subscriber -> {
-            try {
-                List<Page> pages = getPageUrlsFromDiskCacheImpl(chapterUrl);
-                subscriber.onNext(pages);
-                subscriber.onCompleted();
-            } catch (Throwable e) {
-                subscriber.onError(e);
-            }
-        });
-    }
-
-    private List<Page> getPageUrlsFromDiskCacheImpl(String chapterUrl) throws IOException {
             DiskLruCache.Snapshot snapshot = null;
-        List<Page> pages = null;
 
             try {
+                // Create md5 key and retrieve snapshot.
                 String key = DiskUtils.hashKeyForDisk(chapterUrl);
                 snapshot = diskCache.get(key);
 
-            Type collectionType = new TypeToken<List<Page>>() {}.getType();
+                // Convert JSON string to list of objects.
-            pages = gson.fromJson(snapshot.getString(0), collectionType);
+                return gson.fromJson(snapshot.getString(0), pageListCollection);
-        } catch (IOException e) {
+
-            // Do Nothing.
             } finally {
                 if (snapshot != null) {
                     snapshot.close();
                 }
             }
-        return pages;
+        });
     }
 
-    public void putPageUrlsToDiskCache(final String chapterUrl, final List<Page> pages) {
+    /**
+     * Add page list to disk cache.
+     * @param chapterUrl the url of the chapter.
+     * @param pages list of pages.
+     */
+    public void putPageListToCache(final String chapterUrl, final List<Page> pages) {
+        // Convert list of pages to json string.
         String cachedValue = gson.toJson(pages);
 
+        // Initialize the editor (edits the values for an entry).
         DiskLruCache.Editor editor = null;
+
+        // Initialize OutputStream.
         OutputStream outputStream = null;
+
         try {
+            // Get editor from md5 key.
             String key = DiskUtils.hashKeyForDisk(chapterUrl);
             editor = diskCache.edit(key);
             if (editor == null) {
                 return;
             }
 
+            // Write chapter urls to cache.
             outputStream = new BufferedOutputStream(editor.newOutputStream(0));
             outputStream.write(cachedValue.getBytes());
             outputStream.flush();
@@ -143,37 +194,57 @@ public class ChapterCache {
         }
     }
 
+    /**
+     * Check if image is in cache.
+     * @param imageUrl url of image.
+     * @return true if in cache otherwise false.
+     */
     public boolean isImageInCache(final String imageUrl) {
         try {
             return diskCache.get(DiskUtils.hashKeyForDisk(imageUrl)) != null;
         } catch (IOException e) {
-            e.printStackTrace();
-        }
             return false;
         }
+    }
 
+    /**
+     * Get image path from url.
+     * @param imageUrl url of image.
+     * @return path of image.
+     */
     public String getImagePath(final String imageUrl) {
         try {
+            // Get file from md5 key.
             String imageName = DiskUtils.hashKeyForDisk(imageUrl) + ".0";
             File file = new File(diskCache.getDirectory(), imageName);
             return file.getCanonicalPath();
         } catch (IOException e) {
-            e.printStackTrace();
-        }
             return null;
         }
+    }
 
-    public void putImageToDiskCache(final String imageUrl, final Response response) throws IOException {
+    /**
+     * Add image to cache.
+     * @param imageUrl url of image.
+     * @param response http response from page.
+     * @throws IOException image error.
+     */
+    public void putImageToCache(final String imageUrl, final Response response) throws IOException {
+        // Initialize editor (edits the values for an entry).
         DiskLruCache.Editor editor = null;
+
+        // Initialize BufferedSink (used for small writes).
         BufferedSink sink = null;
 
         try {
+            // Get editor from md5 key.
             String key = DiskUtils.hashKeyForDisk(imageUrl);
             editor = diskCache.edit(key);
             if (editor == null) {
                 throw new IOException("Unable to edit key");
             }
 
+            // Initialize OutputStream and write image.
             OutputStream outputStream = new BufferedOutputStream(editor.newOutputStream(0));
             sink = Okio.buffer(Okio.sink(outputStream));
             sink.writeAll(response.body().source());
@@ -181,6 +252,7 @@ public class ChapterCache {
             diskCache.flush();
             editor.commit();
         } catch (Exception e) {
+            response.body().close();
             throw new IOException("Unable to save image");
         } finally {
             if (editor != null) {
@@ -190,7 +262,6 @@ public class ChapterCache {
                 sink.close();
             }
         }
-
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverCache.java

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.data.cache;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
@@ -10,6 +11,7 @@ import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.LazyHeaders;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.signature.StringSignature;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,33 +22,76 @@ import java.io.OutputStream;
 
 import eu.kanade.tachiyomi.util.DiskUtils;
 
+/**
+ * Class used to create cover cache
+ * It is used to store the covers of the library.
+ * Makes use of Glide (which can avoid repeating requests) to download covers.
+ * Names of files are created with the md5 of the thumbnail URL
+ */
 public class CoverCache {
 
+    /**
+     * Name of cache directory.
+     */
     private static final String PARAMETER_CACHE_DIRECTORY = "cover_disk_cache";
 
-    private Context context;
+    /**
-    private File cacheDir;
+     * Interface to global information about an application environment.
+     */
+    private final Context context;
 
+    /**
+     * Cache directory used for cache management.
+     */
+    private final File cacheDir;
+
+    /**
+     * Constructor of CoverCache.
+     *
+     * @param context application environment interface.
+     */
     public CoverCache(Context context) {
         this.context = context;
+
+        // Get cache directory from parameter.
         cacheDir = new File(context.getCacheDir(), PARAMETER_CACHE_DIRECTORY);
+
+        // Create cache directory.
         createCacheDir();
     }
 
+    /**
+     * Create cache directory if it doesn't exist
+     *
+     * @return true if cache dir is created otherwise false.
+     */
     private boolean createCacheDir() {
         return !cacheDir.exists() && cacheDir.mkdirs();
     }
 
+    /**
+     * Download the cover with Glide and save the file in this cache.
+     *
+     * @param thumbnailUrl url of thumbnail.
+     * @param headers      headers included in Glide request.
+     */
     public void save(String thumbnailUrl, LazyHeaders headers) {
         save(thumbnailUrl, headers, null);
     }
 
-    // Download the cover with Glide (it can avoid repeating requests) and save the file on this cache
+    /**
-    // Optionally, load the image in the given image view when the resource is ready, if not null
+     * Download the cover with Glide and save the file.
-    public void save(String thumbnailUrl, LazyHeaders headers, ImageView imageView) {
+     *
+     * @param thumbnailUrl url of thumbnail.
+     * @param headers      headers included in Glide request.
+     * @param imageView    imageView where picture should be displayed.
+     */
+    private void save(String thumbnailUrl, LazyHeaders headers, @Nullable ImageView imageView) {
+        // Check if url is empty.
         if (TextUtils.isEmpty(thumbnailUrl))
             return;
 
+        // Download the cover with Glide and save the file.
         GlideUrl url = new GlideUrl(thumbnailUrl, headers);
         Glide.with(context)
                 .load(url)
@@ -54,29 +99,44 @@ public class CoverCache {
                     @Override
                     public void onResourceReady(File resource, GlideAnimation<? super File> anim) {
                         try {
-                            add(thumbnailUrl, resource);
+                            // Copy the cover from Glide's cache to local cache.
+                            copyToLocalCache(thumbnailUrl, resource);
+
+                            // Check if imageView isn't null and show picture in imageView.
                             if (imageView != null) {
                                 loadFromCache(imageView, resource);
                             }
                         } catch (IOException e) {
-                            e.printStackTrace();
+                            // Do nothing.
                         }
                     }
                 });
     }
 
-    // Copy the cover from Glide's cache to this cache
+    /**
-    public void add(String thumbnailUrl, File source) throws IOException {
+     * Copy the cover from Glide's cache to this cache.
+     *
+     * @param thumbnailUrl url of thumbnail.
+     * @param source       the cover image.
+     * @throws IOException exception returned
+     */
+    public void copyToLocalCache(String thumbnailUrl, File source) throws IOException {
+        // Create cache directory if needed.
         createCacheDir();
+
+        // Get destination file.
         File dest = new File(cacheDir, DiskUtils.hashKeyForDisk(thumbnailUrl));
+
+        // Delete the current file if it exists.
         if (dest.exists())
             dest.delete();
 
+        // Write thumbnail image to file.
         InputStream in = new FileInputStream(source);
         try {
             OutputStream out = new FileOutputStream(dest);
             try {
-                // Transfer bytes from in to out
+                // Transfer bytes from in to out.
                 byte[] buf = new byte[1024];
                 int len;
                 while ((len = in.read(buf)) > 0) {
@@ -90,23 +150,43 @@ public class CoverCache {
         }
     }
 
-    // Get the cover from cache
+
-    public File get(String thumbnailUrl) {
+    /**
+     * Returns the cover from cache.
+     *
+     * @param thumbnailUrl the thumbnail url.
+     * @return cover image.
+     */
+    private File getCoverFromCache(String thumbnailUrl) {
         return new File(cacheDir, DiskUtils.hashKeyForDisk(thumbnailUrl));
     }
 
-    // Delete the cover from cache
+    /**
-    public boolean delete(String thumbnailUrl) {
+     * Delete the cover file from the cache.
+     *
+     * @param thumbnailUrl the thumbnail url.
+     * @return status of deletion.
+     */
+    public boolean deleteCoverFromCache(String thumbnailUrl) {
+        // Check if url is empty.
         if (TextUtils.isEmpty(thumbnailUrl))
             return false;
 
+        // Remove file.
         File file = new File(cacheDir, DiskUtils.hashKeyForDisk(thumbnailUrl));
         return file.exists() && file.delete();
     }
 
-    // Save and load the image from cache
+    /**
-    public void saveAndLoadFromCache(ImageView imageView, String thumbnailUrl, LazyHeaders headers) {
+     * Save or load the image from cache
-        File localCover = get(thumbnailUrl);
+     *
+     * @param imageView    imageView where picture should be displayed.
+     * @param thumbnailUrl the thumbnail url.
+     * @param headers      headers included in Glide request.
+     */
+    public void saveOrLoadFromCache(ImageView imageView, String thumbnailUrl, LazyHeaders headers) {
+        // If file exist load it otherwise save it.
+        File localCover = getCoverFromCache(thumbnailUrl);
         if (localCover.exists()) {
             loadFromCache(imageView, localCover);
         } else {
@@ -114,29 +194,36 @@ public class CoverCache {
         }
     }
 
-    // If the image is already in our cache, use it. If not, load it with glide
+    /**
-    public void loadFromCacheOrNetwork(ImageView imageView, String thumbnailUrl, LazyHeaders headers) {
+     * Helper method to load the cover from the cache directory into the specified image view.
-        File localCover = get(thumbnailUrl);
+     * Glide stores the resized image in its cache to improve performance.
-        if (localCover.exists()) {
+     *
-            loadFromCache(imageView, localCover);
+     * @param imageView imageView where picture should be displayed.
-        } else {
+     * @param file      file to load. Must exist!.
-            loadFromNetwork(imageView, thumbnailUrl, headers);
+     */
-        }
-    }
-
-    // Helper method to load the cover from the cache directory into the specified image view
-    // The file must exist
     private void loadFromCache(ImageView imageView, File file) {
         Glide.with(context)
                 .load(file)
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .diskCacheStrategy(DiskCacheStrategy.RESULT)
                 .centerCrop()
+                .signature(new StringSignature(String.valueOf(file.lastModified())))
                 .into(imageView);
     }
 
-    // Helper method to load the cover from network into the specified image view.
+    /**
-    // It does NOT save the image in cache
+     * Helper method to load the cover from network into the specified image view.
+     * The source image is stored in Glide's cache so that it can be easily copied to this cache
+     * if the manga is added to the library.
+     *
+     * @param imageView    imageView where picture should be displayed.
+     * @param thumbnailUrl url of thumbnail.
+     * @param headers      headers included in Glide request.
+     */
     public void loadFromNetwork(ImageView imageView, String thumbnailUrl, LazyHeaders headers) {
+        // Check if url is empty.
+        if (TextUtils.isEmpty(thumbnailUrl))
+            return;
+
         GlideUrl url = new GlideUrl(thumbnailUrl, headers);
         Glide.with(context)
                 .load(url)

app/src/main/java/eu/kanade/tachiyomi/data/cache/CoverGlideModule.java

@@ -5,17 +5,26 @@ import android.content.Context;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
 import com.bumptech.glide.load.DecodeFormat;
+import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.bumptech.glide.module.GlideModule;
 
+/**
+ * Class used to update Glide module settings
+ */
 public class CoverGlideModule implements GlideModule {
 
     @Override
     public void applyOptions(Context context, GlideBuilder builder) {
+        // Bitmaps decoded from most image formats (other than GIFs with hidden configs)
+        // will be decoded with the ARGB_8888 config.
         builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+
+        // Set the cache size of Glide to 15 MiB
+        builder.setDiskCache(new InternalCacheDiskCacheFactory(context, 15 * 1024 * 1024));
     }
 
     @Override
     public void registerComponents(Context context, Glide glide) {
-
+        // Nothing to see here!
     }
 }

app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.java

@@ -162,11 +162,11 @@ public class DatabaseHelper {
                 .prepare();
     }
 
-    public PreparedGetListOfObjects<MangaChapter> getRecentChapters() {
+    public PreparedGetListOfObjects<MangaChapter> getRecentChapters(Date date) {
         return db.get()
                 .listOfObjects(MangaChapter.class)
                 .withQuery(RawQuery.builder()
-                        .query(MangaChapterGetResolver.RECENT_CHAPTERS_QUERY)
+                        .query(MangaChapterGetResolver.getRecentChaptersQuery(date))
                         .observesTables(ChapterTable.TABLE)
                         .build())
                 .withGetResolver(MangaChapterGetResolver.INSTANCE)

app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.java

@@ -68,6 +68,25 @@ public class Manga implements Serializable {
     public static final int COMPLETED = 2;
     public static final int LICENSED = 3;
 
+    public static final int SORT_AZ   = 0x00000000;
+    public static final int SORT_ZA   = 0x00000001;
+    public static final int SORT_MASK = 0x00000001;
+
+    public static final int SHOW_UNREAD = 0x00000002;
+    public static final int SHOW_READ   = 0x00000004;
+    public static final int READ_MASK   = 0x00000006;
+
+    public static final int SHOW_DOWNLOADED     = 0x00000008;
+    public static final int SHOW_NOT_DOWNLOADED = 0x00000010;
+    public static final int DOWNLOADED_MASK     = 0x00000018;
+
+    // Generic filter that does not filter anything
+    public static final int SHOW_ALL    = 0x00000000;
+
+    public static final int DISPLAY_NAME   = 0x00000000;
+    public static final int DISPLAY_NUMBER = 0x00100000;
+    public static final int DISPLAY_MASK   = 0x00100000;
+
     public Manga() {}
 
     public static Manga create(String pathUrl) {
@@ -120,6 +139,43 @@ public class Manga implements Serializable {
         }
     }
 
+    public void setChapterOrder(int order) {
+        setFlags(order, SORT_MASK);
+    }
+
+    public void setDisplayMode(int mode) {
+        setFlags(mode, DISPLAY_MASK);
+    }
+
+    public void setReadFilter(int filter) {
+        setFlags(filter, READ_MASK);
+    }
+
+    public void setDownloadedFilter(int filter) {
+        setFlags(filter, DOWNLOADED_MASK);
+    }
+
+    private void setFlags(int flag, int mask) {
+        chapter_flags = (chapter_flags & ~mask) | (flag & mask);
+    }
+
+    public boolean sortChaptersAZ() {
+        return (chapter_flags & SORT_MASK) == SORT_AZ;
+    }
+
+    // Used to display the chapter's title one way or another
+    public int getDisplayMode() {
+        return chapter_flags & DISPLAY_MASK;
+    }
+
+    public int getReadFilter() {
+        return chapter_flags & READ_MASK;
+    }
+
+    public int getDownloadedFilter() {
+        return chapter_flags & DOWNLOADED_MASK;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaChapterGetResolver.java

@@ -5,6 +5,8 @@ import android.support.annotation.NonNull;
 
 import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver;
 
+import java.util.Date;
+
 import eu.kanade.tachiyomi.data.database.models.Chapter;
 import eu.kanade.tachiyomi.data.database.models.ChapterStorIOSQLiteGetResolver;
 import eu.kanade.tachiyomi.data.database.models.Manga;
@@ -24,10 +26,12 @@ public class MangaChapterGetResolver extends DefaultGetResolver<MangaChapter> {
             MangaTable.COLUMN_ID,
             ChapterTable.COLUMN_MANGA_ID);
 
-    public static final String RECENT_CHAPTERS_QUERY = String.format(
+    public static String getRecentChaptersQuery(Date date) {
-            QUERY + " WHERE %1$s = 1 ORDER BY %2$s DESC LIMIT 100",
+        return QUERY + String.format(" WHERE %1$s = 1 AND %2$s > %3$d ORDER BY %2$s DESC",
                 MangaTable.COLUMN_FAVORITE,
-            ChapterTable.COLUMN_DATE_UPLOAD);
+                ChapterTable.COLUMN_DATE_UPLOAD,
+                date.getTime());
+    }
 
     @NonNull
     private final MangaStorIOSQLiteGetResolver mangaGetResolver;
@@ -45,6 +49,7 @@ public class MangaChapterGetResolver extends DefaultGetResolver<MangaChapter> {
     public MangaChapter mapFromCursor(@NonNull Cursor cursor) {
         final Manga manga = mangaGetResolver.mapFromCursor(cursor);
         final Chapter chapter = chapterGetResolver.mapFromCursor(cursor);
+        manga.id = chapter.manga_id;
 
         return new MangaChapter(manga, chapter);
     }

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.java

@@ -8,7 +8,6 @@ import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
@@ -26,6 +25,8 @@ import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.event.DownloadChaptersEvent;
 import eu.kanade.tachiyomi.util.DiskUtils;
+import eu.kanade.tachiyomi.util.DynamicConcurrentMergeOperator;
+import eu.kanade.tachiyomi.util.UrlUtil;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -45,6 +46,9 @@ public class DownloadManager {
     private BehaviorSubject<Boolean> runningSubject;
     private Subscription downloadsSubscription;
 
+    private BehaviorSubject<Integer> threadsSubject;
+    private Subscription threadsSubscription;
+
     private DownloadQueue queue;
     private volatile boolean isRunning;
 
@@ -60,15 +64,19 @@ public class DownloadManager {
 
         downloadsQueueSubject = PublishSubject.create();
         runningSubject = BehaviorSubject.create();
+        threadsSubject = BehaviorSubject.create();
     }
 
     private void initializeSubscriptions() {
         if (downloadsSubscription != null && !downloadsSubscription.isUnsubscribed())
             downloadsSubscription.unsubscribe();
 
+        threadsSubscription = preferences.downloadThreads().asObservable()
+                .subscribe(threadsSubject::onNext);
+
         downloadsSubscription = downloadsQueueSubject
-                .concatMap(downloads -> Observable.from(downloads)
+                .flatMap(Observable::from)
-                        .flatMap(this::downloadChapter, preferences.downloadThreads()))
+                .lift(new DynamicConcurrentMergeOperator<>(this::downloadChapter, threadsSubject))
                 .onBackpressureBuffer()
                 .observeOn(AndroidSchedulers.mainThread())
                 .map(download -> areAllDownloadsFinished())
@@ -94,6 +102,11 @@ public class DownloadManager {
             downloadsSubscription.unsubscribe();
             downloadsSubscription = null;
         }
+
+        if (threadsSubscription != null && !threadsSubscription.isUnsubscribed()) {
+            threadsSubscription.unsubscribe();
+        }
+
     }
 
     // Create a download object for every chapter in the event and add them to the downloads queue
@@ -181,8 +194,7 @@ public class DownloadManager {
                 // Or if the page list already exists, start from the file
                 Observable.just(download.pages);
 
-        return pageListObservable
+        return Observable.defer(() -> pageListObservable
-                .subscribeOn(Schedulers.io())
                 .doOnNext(pages -> {
                     download.downloadedImages = 0;
                     download.setStatus(Download.DOWNLOADING);
@@ -199,7 +211,8 @@ public class DownloadManager {
                 .onErrorResumeNext(error -> {
                     download.setStatus(Download.ERROR);
                     return Observable.just(download);
-                });
+                }))
+                .subscribeOn(Schedulers.io());
     }
 
     // Get the image from the filesystem if it exists or download from network
@@ -271,6 +284,15 @@ public class DownloadManager {
     // Get the filename for an image given the page
     private String getImageFilename(Page page) {
         String url = page.getImageUrl();
+        int number = page.getPageNumber() + 1;
+        // Try to preserve file extension
+        if (UrlUtil.isJpg(url)) {
+            return number + ".jpg";
+        } else if (UrlUtil.isPng(url)) {
+            return number + ".png";
+        } else if (UrlUtil.isGif(url)) {
+            return number + ".gif";
+        }
         return Uri.parse(url).getLastPathSegment().replaceAll("[^\\sa-zA-Z0-9.-]", "_");
     }
 
@@ -306,7 +328,6 @@ public class DownloadManager {
 
     // Return the page list from the chapter's directory if it exists, null otherwise
     public List<Page> getSavedPageList(Source source, Manga manga, Chapter chapter) {
-        List<Page> pages = null;
         File chapterDir = getAbsoluteChapterDirectory(source, manga, chapter);
         File pagesFile = new File(chapterDir, PAGE_LIST_FILE);
 
@@ -315,14 +336,14 @@ public class DownloadManager {
             if (pagesFile.exists()) {
                 reader = new JsonReader(new FileReader(pagesFile.getAbsolutePath()));
                 Type collectionType = new TypeToken<List<Page>>() {}.getType();
-                pages = gson.fromJson(reader, collectionType);
+                return gson.fromJson(reader, collectionType);
             }
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
             Timber.e(e.getCause(), e.getMessage());
         } finally {
             if (reader != null) try { reader.close(); } catch (IOException e) { /* Do nothing */ }
         }
-        return pages;
+        return null;
     }
 
     // Shortcut for the method above

app/src/main/java/eu/kanade/tachiyomi/data/download/model/DownloadQueue.java

@@ -43,11 +43,11 @@ public class DownloadQueue extends ArrayList<Download> {
     }
 
     public Observable<Download> getStatusObservable() {
-        return statusSubject;
+        return statusSubject.onBackpressureBuffer();
     }
 
     public Observable<Download> getProgressObservable() {
-        return statusSubject
+        return statusSubject.onBackpressureBuffer()
                 .startWith(getActiveDownloads())
                 .flatMap(download -> {
                     if (download.getStatus() == Download.DOWNLOADING) {

app/src/main/java/eu/kanade/tachiyomi/data/io/IOHandler.java

@@ -0,0 +1,110 @@
+package eu.kanade.tachiyomi.data.io;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class IOHandler {
+    /**
+     * Get full filepath of build in Android File picker.
+     * If Google Drive (or other Cloud service) throw exception and download before loading
+     */
+    public static String getFilePath(Uri uri, ContentResolver resolver, Context context) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                String filePath = "";
+                String wholeID = DocumentsContract.getDocumentId(uri);
+
+                //Ugly work around. In sdk version Kitkat or higher external getDocumentId request will have no content://
+                if (wholeID.split(":").length == 1)
+                    throw new IllegalArgumentException();
+
+                // Split at colon, use second item in the array
+                String id = wholeID.split(":")[1];
+
+                String[] column = {MediaStore.Images.Media.DATA};
+
+                // where id is equal to
+                String sel = MediaStore.Images.Media._ID + "=?";
+
+                Cursor cursor = context.getContentResolver().query(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                        column, sel, new String[]{id}, null);
+
+                int columnIndex = cursor != null ? cursor.getColumnIndex(column[0]) : 0;
+
+                if (cursor != null ? cursor.moveToFirst() : false) {
+                    filePath = cursor.getString(columnIndex);
+                }
+                cursor.close();
+                return filePath;
+            } else {
+                String[] fields = {MediaStore.Images.Media.DATA};
+
+                Cursor cursor = resolver.query(uri, fields, null, null, null);
+
+                if (cursor == null)
+                    return null;
+
+                cursor.moveToFirst();
+                String path = cursor.getString(cursor.getColumnIndex(MediaStore.Images.Media.DATA));
+                cursor.close();
+
+                return path;
+            }
+        } catch (IllegalArgumentException e) {
+            //This exception is thrown when Google Drive. Try to download file
+            return downloadMediaAndReturnPath(uri, resolver, context);
+        }
+    }
+
+    private static String getTempFilename(Context context) throws IOException {
+        File outputDir = context.getCacheDir();
+        File outputFile = File.createTempFile("temp_cover", "0", outputDir);
+        return outputFile.getAbsolutePath();
+    }
+
+    private static String downloadMediaAndReturnPath(Uri uri, ContentResolver resolver, Context context) {
+        if (uri == null) return null;
+        FileInputStream input = null;
+        FileOutputStream output = null;
+        try {
+            ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "r");
+            FileDescriptor fd = pfd != null ? pfd.getFileDescriptor() : null;
+            input = new FileInputStream(fd);
+
+            String tempFilename = getTempFilename(context);
+            output = new FileOutputStream(tempFilename);
+
+            int read;
+            byte[] bytes = new byte[4096];
+            while ((read = input.read(bytes)) != -1) {
+                output.write(bytes, 0, read);
+            }
+            return tempFilename;
+        } catch (IOException ignored) {
+        } finally {
+            if (input != null) try {
+                input.close();
+            } catch (Exception ignored) {
+            }
+            if (output != null) try {
+                output.close();
+            } catch (Exception ignored) {
+            }
+        }
+        return null;
+
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/mangasync/base/MangaSyncService.java

@@ -1,8 +1,7 @@
 package eu.kanade.tachiyomi.data.mangasync.base;
 
-import com.squareup.okhttp.Response;
-
 import eu.kanade.tachiyomi.data.database.models.MangaSync;
+import okhttp3.Response;
 import rx.Observable;
 
 public abstract class MangaSyncService {

app/src/main/java/eu/kanade/tachiyomi/data/mangasync/services/MyAnimeList.java

@@ -4,12 +4,6 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.Xml;
 
-import com.squareup.okhttp.Credentials;
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-
 import org.jsoup.Jsoup;
 import org.xmlpull.v1.XmlSerializer;
 
@@ -26,6 +20,11 @@ import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager;
 import eu.kanade.tachiyomi.data.mangasync.base.MangaSyncService;
 import eu.kanade.tachiyomi.data.network.NetworkHelper;
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper;
+import okhttp3.Credentials;
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import rx.Observable;
 
 public class MyAnimeList extends MangaSyncService {
@@ -209,7 +208,7 @@ public class MyAnimeList extends MangaSyncService {
         xml.endTag("", ENTRY_TAG);
         xml.endDocument();
 
-        FormEncodingBuilder form = new FormEncodingBuilder();
+        FormBody.Builder form = new FormBody.Builder();
         form.add("data", writer.toString());
         return form.build();
     }

app/src/main/java/eu/kanade/tachiyomi/data/network/NetworkHelper.java

@@ -1,34 +1,47 @@
 package eu.kanade.tachiyomi.data.network;
 
 
-import com.squareup.okhttp.CacheControl;
+import android.content.Context;
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
 
+import java.io.File;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.CookieStore;
 
+import okhttp3.Cache;
+import okhttp3.CacheControl;
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.JavaNetCookieJar;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import rx.Observable;
 
 public final class NetworkHelper {
 
     private OkHttpClient client;
+
     private CookieManager cookieManager;
 
     public final CacheControl NULL_CACHE_CONTROL = new CacheControl.Builder().noCache().build();
     public final Headers NULL_HEADERS = new Headers.Builder().build();
-    public final RequestBody NULL_REQUEST_BODY = new FormEncodingBuilder().build();
+    public final RequestBody NULL_REQUEST_BODY = new FormBody.Builder().build();
+
+    private static final int CACHE_SIZE = 5 * 1024 * 1024; // 5 MiB
+    private static final String CACHE_DIR_NAME = "network_cache";
+
+    public NetworkHelper(Context context) {
+        File cacheDir = new File(context.getCacheDir(), CACHE_DIR_NAME);
 
-    public NetworkHelper() {
-        client = new OkHttpClient();
         cookieManager = new CookieManager();
         cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
-        client.setCookieHandler(cookieManager);
+
+        client = new OkHttpClient.Builder()
+                .cookieJar(new JavaNetCookieJar(cookieManager))
+                .cache(new Cache(cacheDir, CACHE_SIZE))
+                .build();
     }
 
     public Observable<Response> getResponse(final String url, final Headers headers, final CacheControl cacheControl) {
@@ -86,19 +99,20 @@ public final class NetworkHelper {
                         .headers(headers != null ? headers : NULL_HEADERS)
                         .build();
 
-                OkHttpClient progressClient = client.clone();
+                OkHttpClient progressClient = client.newBuilder()
-
+                        .cache(null)
-                progressClient.networkInterceptors().add(chain -> {
+                        .addNetworkInterceptor(chain -> {
                             Response originalResponse = chain.proceed(chain.request());
                             return originalResponse.newBuilder()
                                     .body(new ProgressResponseBody(originalResponse.body(), listener))
                                     .build();
-                });
+                        }).build();
+
                 return Observable.just(progressClient.newCall(request).execute());
             } catch (Throwable e) {
                 return Observable.error(e);
             }
-        }).retry(2);
+        }).retry(1);
     }
 
     public CookieStore getCookies() {

app/src/main/java/eu/kanade/tachiyomi/data/network/ProgressResponseBody.java

@@ -1,10 +1,9 @@
 package eu.kanade.tachiyomi.data.network;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
-
 import java.io.IOException;
 
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
 import okio.Buffer;
 import okio.BufferedSource;
 import okio.ForwardingSource;
@@ -26,11 +25,11 @@ public class ProgressResponseBody extends ResponseBody {
         return responseBody.contentType();
     }
 
-    @Override public long contentLength() throws IOException {
+    @Override public long contentLength() {
         return responseBody.contentLength();
     }
 
-    @Override public BufferedSource source() throws IOException {
+    @Override public BufferedSource source() {
         if (bufferedSource == null) {
             bufferedSource = Okio.buffer(source(responseBody.source()));
         }
@@ -40,6 +39,7 @@ public class ProgressResponseBody extends ResponseBody {
     private Source source(Source source) {
         return new ForwardingSource(source) {
             long totalBytesRead = 0L;
+
             @Override public long read(Buffer sink, long byteCount) throws IOException {
                 long bytesRead = super.read(sink, byteCount);
                 // read() returns the number of bytes read, or -1 if this source is exhausted.

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.java

@@ -88,6 +88,10 @@ public class PreferencesHelper {
         return prefs.getInt(getKey(R.string.pref_default_viewer_key), 1);
     }
 
+    public Preference<Integer> imageScaleType() {
+        return rxPrefs.getInteger(getKey(R.string.pref_image_scale_type_key), 1);
+    }
+
     public Preference<Integer> portraitColumns() {
         return rxPrefs.getInteger(getKey(R.string.pref_library_columns_portrait_key), 0);
     }
@@ -116,6 +120,10 @@ public class PreferencesHelper {
         return rxPrefs.getInteger(getKey(R.string.pref_reader_theme_key), 0);
     }
 
+    public Preference<Boolean> catalogueAsList() {
+        return rxPrefs.getBoolean(getKey(R.string.pref_display_catalogue_as_list), false);
+    }
+
     public String getSourceUsername(Source source) {
         return prefs.getString(SOURCE_ACCOUNT_USERNAME + source.getId(), "");
     }
@@ -155,8 +163,8 @@ public class PreferencesHelper {
         prefs.edit().putString(getKey(R.string.pref_download_directory_key), path).apply();
     }
 
-    public int downloadThreads() {
+    public Preference<Integer> downloadThreads() {
-        return prefs.getInt(getKey(R.string.pref_download_slots_key), 1);
+        return rxPrefs.getInteger(getKey(R.string.pref_download_slots_key), 1);
     }
 
     public boolean downloadOnlyOverWifi() {

app/src/main/java/eu/kanade/tachiyomi/data/source/base/BaseSource.java

@@ -1,8 +1,5 @@
 package eu.kanade.tachiyomi.data.source.base;
 
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.Response;
-
 import org.jsoup.nodes.Document;
 
 import java.util.List;
@@ -10,6 +7,8 @@ import java.util.List;
 import eu.kanade.tachiyomi.data.database.models.Chapter;
 import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.source.model.MangasPage;
+import okhttp3.Headers;
+import okhttp3.Response;
 import rx.Observable;
 
 public abstract class BaseSource {

app/src/main/java/eu/kanade/tachiyomi/data/source/base/Source.java

@@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.data.source.base;
 import android.content.Context;
 
 import com.bumptech.glide.load.model.LazyHeaders;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.Response;
 
 import org.jsoup.Jsoup;
 
@@ -23,6 +21,8 @@ import eu.kanade.tachiyomi.data.network.NetworkHelper;
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper;
 import eu.kanade.tachiyomi.data.source.model.MangasPage;
 import eu.kanade.tachiyomi.data.source.model.Page;
+import okhttp3.Headers;
+import okhttp3.Response;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 
@@ -93,7 +93,7 @@ public abstract class Source extends BaseSource {
     }
 
     public Observable<List<Page>> getCachedPageListOrPullFromNetwork(final String chapterUrl) {
-        return chapterCache.getPageUrlsFromDiskCache(getChapterCacheKey(chapterUrl))
+        return chapterCache.getPageListFromCache(getChapterCacheKey(chapterUrl))
                 .onErrorResumeNext(throwable -> {
                     return pullPageListFromNetwork(chapterUrl);
                 })
@@ -168,7 +168,7 @@ public abstract class Source extends BaseSource {
         return getImageProgressResponse(page)
                 .flatMap(resp -> {
                     try {
-                        chapterCache.putImageToDiskCache(page.getImageUrl(), resp);
+                        chapterCache.putImageToCache(page.getImageUrl(), resp);
                     } catch (IOException e) {
                         return Observable.error(e);
                     }
@@ -182,7 +182,7 @@ public abstract class Source extends BaseSource {
 
     public void savePageList(String chapterUrl, List<Page> pages) {
         if (pages != null)
-            chapterCache.putPageUrlsToDiskCache(getChapterCacheKey(chapterUrl), pages);
+            chapterCache.putPageListToCache(getChapterCacheKey(chapterUrl), pages);
     }
 
     protected List<Page> convertToPages(List<String> pageUrls) {

app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Batoto.java

@@ -4,10 +4,6 @@ import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.Response;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -35,6 +31,9 @@ import eu.kanade.tachiyomi.data.source.base.LoginSource;
 import eu.kanade.tachiyomi.data.source.model.MangasPage;
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.util.Parser;
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.Response;
 import rx.Observable;
 
 public class Batoto extends LoginSource {
@@ -320,7 +319,7 @@ public class Batoto extends LoginSource {
         Element form = doc.select("#login").first();
         String postUrl = form.attr("action");
 
-        FormEncodingBuilder formBody = new FormEncodingBuilder();
+        FormBody.Builder formBody = new FormBody.Builder();
         Element authKey = form.select("input[name=auth_key]").first();
 
         formBody.add(authKey.attr("name"), authKey.attr("value"));
@@ -354,8 +353,13 @@ public class Batoto extends LoginSource {
     @Override
     public Observable<List<Chapter>> pullChaptersFromNetwork(String mangaUrl) {
         Observable<List<Chapter>> observable;
-        if (!isLogged()) {
+        String username = prefs.getSourceUsername(this);
-            observable = login(prefs.getSourceUsername(this), prefs.getSourcePassword(this))
+        String password = prefs.getSourcePassword(this);
+        if (username.isEmpty() && password.isEmpty()) {
+            observable = Observable.error(new Exception("User not logged"));
+        }
+        else if (!isLogged()) {
+            observable = login(username, password)
                     .flatMap(result -> super.pullChaptersFromNetwork(mangaUrl));
         }
         else {

app/src/main/java/eu/kanade/tachiyomi/data/source/online/english/Kissmanga.java

@@ -3,10 +3,6 @@ package eu.kanade.tachiyomi.data.source.online.english;
 import android.content.Context;
 import android.net.Uri;
 
-import com.squareup.okhttp.FormEncodingBuilder;
-import com.squareup.okhttp.Headers;
-import com.squareup.okhttp.Response;
-
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -26,6 +22,9 @@ import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.data.source.model.MangasPage;
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.util.Parser;
+import okhttp3.FormBody;
+import okhttp3.Headers;
+import okhttp3.Response;
 import rx.Observable;
 
 public class Kissmanga extends Source {
@@ -109,7 +108,7 @@ public class Kissmanga extends Source {
         if (page.page == 1)
             page.url = getInitialSearchUrl(query);
 
-        FormEncodingBuilder form = new FormEncodingBuilder();
+        FormBody.Builder form = new FormBody.Builder();
         form.add("authorArtist", "");
         form.add("mangaName", query);
         form.add("status", "");

app/src/main/java/eu/kanade/tachiyomi/event/MangaEvent.java

@@ -0,0 +1,12 @@
+package eu.kanade.tachiyomi.event;
+
+import eu.kanade.tachiyomi.data.database.models.Manga;
+
+public class MangaEvent {
+
+    public final Manga manga;
+
+    public MangaEvent(Manga manga) {
+        this.manga = manga;
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/injection/component/AppComponent.java

@@ -59,7 +59,6 @@ public interface AppComponent {
     void inject(LibraryUpdateService libraryUpdateService);
     void inject(DownloadService downloadService);
     void inject(UpdateMangaSyncService updateMangaSyncService);
-
     Application application();
 
 }

app/src/main/java/eu/kanade/tachiyomi/injection/module/DataModule.java

@@ -47,8 +47,8 @@ public class DataModule {
 
     @Provides
     @Singleton
-    NetworkHelper provideNetworkHelper() {
+    NetworkHelper provideNetworkHelper(Application app) {
-        return new NetworkHelper();
+        return new NetworkHelper(app);
     }
 
     @Provides

app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/RxPresenter.java

@@ -107,14 +107,14 @@ public class RxPresenter<View> extends Presenter<View> {
     }
 
     /**
-     * Checks if a restartable is subscribed.
+     * Checks if a restartable is unsubscribed.
      *
-     * @param restartableId id of a restartable.
+     * @param restartableId id of the restartable.
-     * @return True if the restartable is subscribed, false otherwise.
+     * @return true if the subscription is null or unsubscribed, false otherwise.
      */
-    public boolean isSubscribed(int restartableId) {
+    public boolean isUnsubscribed(int restartableId) {
-        Subscription s = restartableSubscriptions.get(restartableId);
+        Subscription subscription = restartableSubscriptions.get(restartableId);
-        return s != null && !s.isUnsubscribed();
+        return subscription == null || subscription.isUnsubscribed();
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.java

@@ -31,6 +31,10 @@ public class CatalogueAdapter extends FlexibleAdapter<CatalogueHolder, Manga> {
         notifyDataSetChanged();
     }
 
+    public List<Manga> getItems() {
+        return mItems;
+    }
+
     @Override
     public long getItemId(int position) {
         return mItems.get(position).id;
@@ -44,8 +48,13 @@ public class CatalogueAdapter extends FlexibleAdapter<CatalogueHolder, Manga> {
     @Override
     public CatalogueHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         LayoutInflater inflater = fragment.getActivity().getLayoutInflater();
-        View v = inflater.inflate(R.layout.item_catalogue, parent, false);
+        if (parent.getId() == R.id.catalogue_grid) {
-        return new CatalogueHolder(v, this, fragment);
+            View v = inflater.inflate(R.layout.item_catalogue_grid, parent, false);
+            return new CatalogueGridHolder(v, this, fragment);
+        } else {
+            View v = inflater.inflate(R.layout.item_catalogue_list, parent, false);
+            return new CatalogueListHolder(v, this, fragment);
+        }
     }
 
     @Override

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueFragment.java

@@ -4,7 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -14,9 +17,12 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
+import android.widget.ViewSwitcher;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
@@ -30,11 +36,13 @@ import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder;
 import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment;
+import eu.kanade.tachiyomi.ui.decoration.DividerItemDecoration;
 import eu.kanade.tachiyomi.ui.main.MainActivity;
 import eu.kanade.tachiyomi.ui.manga.MangaActivity;
 import eu.kanade.tachiyomi.util.ToastUtil;
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView;
-import eu.kanade.tachiyomi.widget.EndlessRecyclerScrollListener;
+import eu.kanade.tachiyomi.widget.EndlessGridScrollListener;
+import eu.kanade.tachiyomi.widget.EndlessListScrollListener;
 import icepick.State;
 import nucleus.factory.RequiresPresenter;
 import rx.Subscription;
@@ -45,14 +53,17 @@ import rx.subjects.PublishSubject;
 public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
         implements FlexibleViewHolder.OnListItemClickListener {
 
-    @Bind(R.id.recycler) AutofitRecyclerView recycler;
+    @Bind(R.id.switcher) ViewSwitcher switcher;
+    @Bind(R.id.catalogue_grid) AutofitRecyclerView catalogueGrid;
+    @Bind(R.id.catalogue_list) RecyclerView catalogueList;
     @Bind(R.id.progress) ProgressBar progress;
     @Bind(R.id.progress_grid) ProgressBar progressGrid;
 
     private Toolbar toolbar;
     private Spinner spinner;
     private CatalogueAdapter adapter;
-    private EndlessRecyclerScrollListener scrollListener;
+    private EndlessGridScrollListener gridScrollListener;
+    private EndlessListScrollListener listScrollListener;
 
     @State String query = "";
     @State int selectedIndex = -1;
@@ -61,6 +72,9 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
     private PublishSubject<String> queryDebouncerSubject;
     private Subscription queryDebouncerSubscription;
 
+    private MenuItem displayMode;
+    private MenuItem searchItem;
+
     public static CatalogueFragment newInstance() {
         return new CatalogueFragment();
     }
@@ -77,13 +91,32 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
         View view = inflater.inflate(R.layout.fragment_catalogue, container, false);
         ButterKnife.bind(this, view);
 
-        // Initialize adapter and scroll listener
+        // Initialize adapter, scroll listener and recycler views
-        GridLayoutManager layoutManager = (GridLayoutManager) recycler.getLayoutManager();
         adapter = new CatalogueAdapter(this);
-        scrollListener = new EndlessRecyclerScrollListener(layoutManager, this::requestNextPage);
+
-        recycler.setHasFixedSize(true);
+        GridLayoutManager glm = (GridLayoutManager) catalogueGrid.getLayoutManager();
-        recycler.setAdapter(adapter);
+        gridScrollListener = new EndlessGridScrollListener(glm, this::requestNextPage);
-        recycler.addOnScrollListener(scrollListener);
+        catalogueGrid.setHasFixedSize(true);
+        catalogueGrid.setAdapter(adapter);
+        catalogueGrid.addOnScrollListener(gridScrollListener);
+
+        LinearLayoutManager llm = new LinearLayoutManager(getActivity());
+        listScrollListener = new EndlessListScrollListener(llm, this::requestNextPage);
+        catalogueList.setHasFixedSize(true);
+        catalogueList.setAdapter(adapter);
+        catalogueList.setLayoutManager(llm);
+        catalogueList.addOnScrollListener(listScrollListener);
+        catalogueList.addItemDecoration(new DividerItemDecoration(
+                ContextCompat.getDrawable(getContext(), R.drawable.line_divider)));
+
+        if (getPresenter().isListMode()) {
+            switcher.showNext();
+        }
+
+        Animation inAnim = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in);
+        Animation outAnim = AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out);
+        switcher.setInAnimation(inAnim);
+        switcher.setOutAnimation(outAnim);
 
         // Create toolbar spinner
         Context themedContext = getBaseActivity().getSupportActionBar() != null ?
@@ -109,6 +142,8 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
                     } else {
                         selectedIndex = position;
                         showProgressBar();
+                        glm.scrollToPositionWithOffset(0, 0);
+                        llm.scrollToPositionWithOffset(0, 0);
                         getPresenter().startRequesting(source);
                     }
                 }
@@ -130,7 +165,7 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
         inflater.inflate(R.menu.catalogue_list, menu);
 
         // Initialize search menu
-        MenuItem searchItem = menu.findItem(R.id.action_search);
+        searchItem = menu.findItem(R.id.action_search);
         final SearchView searchView = (SearchView) searchItem.getActionView();
 
         if (!TextUtils.isEmpty(query)) {
@@ -151,6 +186,22 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
                 return true;
             }
         });
+
+        // Show next display mode
+        displayMode = menu.findItem(R.id.action_display_mode);
+        int icon = getPresenter().isListMode() ?
+                R.drawable.ic_view_module_white_24dp : R.drawable.ic_view_list_white_24dp;
+        displayMode.setIcon(icon);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_display_mode:
+                swapDisplayMode();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
@@ -167,6 +218,9 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
 
     @Override
     public void onDestroyView() {
+        if (searchItem != null && searchItem.isActionViewExpanded()) {
+            searchItem.collapseActionView();
+        }
         toolbar.removeView(spinner);
         super.onDestroyView();
     }
@@ -193,11 +247,13 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
 
     private void restartRequest(String newQuery) {
         // If text didn't change, do nothing
-        if (query.equals(newQuery)) return;
+        if (query.equals(newQuery) || getPresenter().getSource() == null)
+            return;
 
         query = newQuery;
         showProgressBar();
-        recycler.getLayoutManager().scrollToPosition(0);
+        catalogueGrid.getLayoutManager().scrollToPosition(0);
+        catalogueList.getLayoutManager().scrollToPosition(0);
 
         getPresenter().restartRequest(query);
     }
@@ -211,9 +267,10 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
 
     public void onAddPage(int page, List<Manga> mangas) {
         hideProgressBar();
-        if (page == 1) {
+        if (page == 0) {
             adapter.clear();
-            scrollListener.resetScroll();
+            gridScrollListener.resetScroll();
+            listScrollListener.resetScroll();
         }
         adapter.addItems(mangas);
     }
@@ -223,15 +280,28 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
     }
 
     public void updateImage(Manga manga) {
-        CatalogueHolder holder = getHolder(manga);
+        CatalogueGridHolder holder = getHolder(manga);
         if (holder != null) {
             holder.setImage(manga, getPresenter());
         }
     }
 
+    public void swapDisplayMode() {
+        getPresenter().swapDisplayMode();
+        boolean isListMode = getPresenter().isListMode();
+        int icon = isListMode ?
+                R.drawable.ic_view_module_white_24dp : R.drawable.ic_view_list_white_24dp;
+        displayMode.setIcon(icon);
+        switcher.showNext();
+        if (!isListMode) {
+            // Initialize mangas if going to grid view
+            getPresenter().initializeMangas(adapter.getItems());
+        }
+    }
+
     @Nullable
-    private CatalogueHolder getHolder(Manga manga) {
+    private CatalogueGridHolder getHolder(Manga manga) {
-        return (CatalogueHolder) recycler.findViewHolderForItemId(manga.id);
+        return (CatalogueGridHolder) catalogueGrid.findViewHolderForItemId(manga.id);
     }
 
     private void showProgressBar() {
@@ -261,12 +331,15 @@ public class CatalogueFragment extends BaseRxFragment<CataloguePresenter>
     public void onListItemLongClick(int position) {
         final Manga selectedManga = adapter.getItem(position);
 
+        int textRes = selectedManga.favorite ? R.string.remove_from_library : R.string.add_to_library;
+
         new MaterialDialog.Builder(getActivity())
-                .items(getString(R.string.add_to_library))
+                .items(getString(textRes))
                 .itemsCallback((dialog, itemView, which, text) -> {
                     switch (which) {
                         case 0:
-                            getPresenter().addMangaToLibrary(selectedManga);
+                            getPresenter().changeMangaFavorite(selectedManga);
+                            adapter.notifyItemChanged(position);
                             break;
                     }
                 })

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueGridHolder.java

@@ -0,0 +1,38 @@
+package eu.kanade.tachiyomi.ui.catalogue;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import eu.kanade.tachiyomi.R;
+import eu.kanade.tachiyomi.data.database.models.Manga;
+
+public class CatalogueGridHolder extends CatalogueHolder {
+
+    @Bind(R.id.title) TextView title;
+    @Bind(R.id.thumbnail) ImageView thumbnail;
+    @Bind(R.id.favorite_sticker) ImageView favoriteSticker;
+
+    public CatalogueGridHolder(View view, CatalogueAdapter adapter, OnListItemClickListener listener) {
+        super(view, adapter, listener);
+        ButterKnife.bind(this, view);
+    }
+
+    @Override
+    public void onSetValues(Manga manga, CataloguePresenter presenter) {
+        title.setText(manga.title);
+        favoriteSticker.setVisibility(manga.favorite ? View.VISIBLE : View.GONE);
+        setImage(manga, presenter);
+    }
+
+    public void setImage(Manga manga, CataloguePresenter presenter) {
+        if (manga.thumbnail_url != null) {
+            presenter.coverCache.loadFromNetwork(thumbnail, manga.thumbnail_url,
+                    presenter.getSource().getGlideHeaders());
+        } else {
+            thumbnail.setImageResource(android.R.color.transparent);
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueHolder.java

@@ -1,38 +1,15 @@
 package eu.kanade.tachiyomi.ui.catalogue;
 
 import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder;
 
-public class CatalogueHolder extends FlexibleViewHolder {
+public abstract class CatalogueHolder extends FlexibleViewHolder {
-
-    @Bind(R.id.title) TextView title;
-    @Bind(R.id.thumbnail) ImageView thumbnail;
-    @Bind(R.id.favorite_sticker) ImageView favoriteSticker;
 
     public CatalogueHolder(View view, CatalogueAdapter adapter, OnListItemClickListener listener) {
         super(view, adapter, listener);
-        ButterKnife.bind(this, view);
     }
 
-    public void onSetValues(Manga manga, CataloguePresenter presenter) {
+    abstract void onSetValues(Manga manga, CataloguePresenter presenter);
-        title.setText(manga.title);
-        favoriteSticker.setVisibility(manga.favorite ? View.VISIBLE : View.GONE);
-        setImage(manga, presenter);
-    }
-
-    public void setImage(Manga manga, CataloguePresenter presenter) {
-        if (manga.thumbnail_url != null) {
-            presenter.coverCache.loadFromNetwork(thumbnail, manga.thumbnail_url,
-                    presenter.getSource().getGlideHeaders());
-        } else {
-            thumbnail.setImageResource(android.R.color.transparent);
-        }
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueListHolder.java

@@ -0,0 +1,32 @@
+package eu.kanade.tachiyomi.ui.catalogue;
+
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+import android.widget.TextView;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import eu.kanade.tachiyomi.R;
+import eu.kanade.tachiyomi.data.database.models.Manga;
+
+public class CatalogueListHolder extends CatalogueHolder {
+
+    @Bind(R.id.title) TextView title;
+
+    private final int favoriteColor;
+    private final int unfavoriteColor;
+
+    public CatalogueListHolder(View view, CatalogueAdapter adapter, OnListItemClickListener listener) {
+        super(view, adapter, listener);
+        ButterKnife.bind(this, view);
+
+        favoriteColor = ContextCompat.getColor(view.getContext(), R.color.hint_text);
+        unfavoriteColor = ContextCompat.getColor(view.getContext(), R.color.primary_text);
+    }
+
+    @Override
+    public void onSetValues(Manga manga, CataloguePresenter presenter) {
+        title.setText(manga.title);
+        title.setTextColor(manga.favorite ? favoriteColor : unfavoriteColor);
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CataloguePresenter.java

@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.catalogue;
 
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Pair;
 
 import com.pushtorefresh.storio.sqlite.operations.put.PutResult;
 
@@ -38,14 +37,16 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
 
     private String query;
 
-    private int currentPage;
+    private RxPager<Manga> pager;
-    private RxPager pager;
     private MangasPage lastMangasPage;
 
     private PublishSubject<List<Manga>> mangaDetailSubject;
 
+    private boolean isListMode;
+
     private static final int GET_MANGA_LIST = 1;
     private static final int GET_MANGA_DETAIL = 2;
+    private static final int GET_MANGA_PAGE = 3;
 
     @Override
     protected void onCreate(Bundle savedState) {
@@ -57,31 +58,46 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
 
         mangaDetailSubject = PublishSubject.create();
 
+        pager = new RxPager<>();
+
         restartableReplay(GET_MANGA_LIST,
-                () -> pager.pages().concatMap(page -> getMangasPageObservable(page + 1)),
+                pager::results,
-                (view, pair) -> view.onAddPage(pair.first, pair.second),
+                (view, pair) -> view.onAddPage(pair.first, pair.second));
-                (view, error) -> {
+
-                    view.onAddPageError();
+        restartableFirst(GET_MANGA_PAGE,
-                    Timber.e(error.getMessage());
+                () -> pager.request(page -> getMangasPageObservable(page + 1)),
-                });
+                (view, next) -> {},
+                (view, error) -> view.onAddPageError());
 
         restartableLatestCache(GET_MANGA_DETAIL,
                 () -> mangaDetailSubject
                         .observeOn(Schedulers.io())
                         .flatMap(Observable::from)
                         .filter(manga -> !manga.initialized)
-                        .window(3)
+                        .concatMap(this::getMangaDetails)
-                        .concatMap(pack -> pack.concatMap(this::getMangaDetails))
                         .onBackpressureBuffer()
                         .observeOn(AndroidSchedulers.mainThread()),
                 CatalogueFragment::updateImage,
                 (view, error) -> Timber.e(error.getMessage()));
+
+        add(prefs.catalogueAsList().asObservable()
+                .subscribe(this::setDisplayMode));
     }
 
     private void onProcessRestart() {
         source = sourceManager.get(sourceId);
         stop(GET_MANGA_LIST);
         stop(GET_MANGA_DETAIL);
+        stop(GET_MANGA_PAGE);
+    }
+
+    private void setDisplayMode(boolean asList) {
+        this.isListMode = asList;
+        if (asList) {
+            stop(GET_MANGA_DETAIL);
+        } else {
+            start(GET_MANGA_DETAIL);
+        }
     }
 
     public void startRequesting(Source source) {
@@ -92,20 +108,23 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
 
     public void restartRequest(String query) {
         this.query = query;
-        stop(GET_MANGA_LIST);
+        stop(GET_MANGA_PAGE);
-        currentPage = 1;
+        lastMangasPage = null;
-        pager = new RxPager();
 
+        if (!isListMode) {
             start(GET_MANGA_DETAIL);
+        }
         start(GET_MANGA_LIST);
+        start(GET_MANGA_PAGE);
     }
 
     public void requestNext() {
-        if (hasNextPage())
+        if (hasNextPage()) {
-            pager.requestNext(++currentPage);
+            start(GET_MANGA_PAGE);
+        }
     }
 
-    private Observable<Pair<Integer, List<Manga>>> getMangasPageObservable(int page) {
+    private Observable<List<Manga>> getMangasPageObservable(int page) {
         MangasPage nextMangasPage = new MangasPage(page);
         if (page != 1) {
             nextMangasPage.url = lastMangasPage.nextPageUrl;
@@ -120,11 +139,7 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
                 .flatMap(mangasPage -> Observable.from(mangasPage.mangas))
                 .map(this::networkToLocalManga)
                 .toList()
-                .map(mangas -> Pair.create(page, mangas))
+                .doOnNext(this::initializeMangas)
-                .doOnNext(pair -> {
-                    if (mangaDetailSubject != null)
-                        mangaDetailSubject.onNext(pair.second);
-                })
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
@@ -138,9 +153,12 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
         return localManga;
     }
 
+    public void initializeMangas(List<Manga> mangas) {
+        mangaDetailSubject.onNext(mangas);
+    }
+
     private Observable<Manga> getMangaDetails(final Manga manga) {
         return source.pullMangaFromNetwork(manga.url)
-                .subscribeOn(Schedulers.io())
                 .flatMap(networkManga -> {
                     manga.copyFrom(networkManga);
                     db.insertManga(manga).executeAsBlocking();
@@ -170,8 +188,17 @@ public class CataloguePresenter extends BasePresenter<CatalogueFragment> {
         return sourceManager.getSources();
     }
 
-    public void addMangaToLibrary(Manga manga) {
+    public void changeMangaFavorite(Manga manga) {
-        manga.favorite = true;
+        manga.favorite = !manga.favorite;
         db.insertManga(manga).executeAsBlocking();
     }
+
+    public boolean isListMode() {
+        return isListMode;
+    }
+
+    public void swapDisplayMode() {
+        prefs.catalogueAsList().set(!isListMode);
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadPresenter.java

@@ -90,6 +90,7 @@ public class DownloadPresenter extends BasePresenter<DownloadFragment> {
                 .flatMap(tick -> Observable.from(download.pages)
                         .map(Page::getProgress)
                         .reduce((x, y) -> x + y))
+                .onBackpressureLatest()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(progress -> {
                     if (download.totalProgress != progress) {

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.java

@@ -52,7 +52,7 @@ public class LibraryCategoryAdapter extends FlexibleAdapter<LibraryHolder, Manga
 
     @Override
     public LibraryHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View v = LayoutInflater.from(fragment.getActivity()).inflate(R.layout.item_catalogue, parent, false);
+        View v = LayoutInflater.from(fragment.getActivity()).inflate(R.layout.item_catalogue_grid, parent, false);
         return new LibraryHolder(v, this, fragment);
     }
 
@@ -67,7 +67,7 @@ public class LibraryCategoryAdapter extends FlexibleAdapter<LibraryHolder, Manga
     }
 
     public int getCoverHeight() {
-        return fragment.recycler.getItemWidth() / 9 * 12;
+        return fragment.recycler.getItemWidth() / 3 * 4;
     }
 
     @Override

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.java

@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi.ui.library;
 
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -17,6 +18,7 @@ import static android.widget.RelativeLayout.LayoutParams;
 
 public class LibraryHolder extends FlexibleViewHolder {
 
+    @Bind(R.id.image_container) FrameLayout container;
     @Bind(R.id.thumbnail) ImageView thumbnail;
     @Bind(R.id.title) TextView title;
     @Bind(R.id.unreadText) TextView unreadText;
@@ -24,7 +26,7 @@ public class LibraryHolder extends FlexibleViewHolder {
     public LibraryHolder(View view, LibraryCategoryAdapter adapter, OnListItemClickListener listener) {
         super(view, adapter, listener);
         ButterKnife.bind(this, view);
-        thumbnail.setLayoutParams(new LayoutParams(MATCH_PARENT, adapter.getCoverHeight()));
+        container.setLayoutParams(new LayoutParams(MATCH_PARENT, adapter.getCoverHeight()));
     }
 
     public void onSetValues(Manga manga, LibraryPresenter presenter) {
@@ -42,7 +44,7 @@ public class LibraryHolder extends FlexibleViewHolder {
 
     private void loadCover(Manga manga, Source source, CoverCache coverCache) {
         if (manga.thumbnail_url != null) {
-            coverCache.saveAndLoadFromCache(thumbnail, manga.thumbnail_url, source.getGlideHeaders());
+            coverCache.saveOrLoadFromCache(thumbnail, manga.thumbnail_url, source.getGlideHeaders());
         } else {
             thumbnail.setImageResource(android.R.color.transparent);
         }

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.java

@@ -58,7 +58,7 @@ public class LibraryPresenter extends BasePresenter<LibraryFragment> {
     @Override
     protected void onTakeView(LibraryFragment libraryFragment) {
         super.onTakeView(libraryFragment);
-        if (!isSubscribed(GET_LIBRARY)) {
+        if (isUnsubscribed(GET_LIBRARY)) {
             start(GET_LIBRARY);
         }
     }

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.java

@@ -8,8 +8,10 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.widget.Toolbar;
 import android.widget.FrameLayout;
 
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialdrawer.DrawerBuilder;
+import com.mikepenz.materialdrawer.model.DividerDrawerItem;
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
 
 import butterknife.Bind;
@@ -29,12 +31,11 @@ public class MainActivity extends BaseActivity {
     @Bind(R.id.appbar) AppBarLayout appBar;
     @Bind(R.id.toolbar) Toolbar toolbar;
     @Bind(R.id.drawer_container) FrameLayout container;
-
+    @State
+    int selectedItem;
     private Drawer drawer;
     private FragmentStack fragmentStack;
 
-    @State int selectedItem;
-
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
@@ -71,20 +72,27 @@ public class MainActivity extends BaseActivity {
                 .addDrawerItems(
                         new PrimaryDrawerItem()
                                 .withName(R.string.label_library)
-                                .withIdentifier(R.id.nav_drawer_library),
+                                .withIdentifier(R.id.nav_drawer_library)
-//                        new PrimaryDrawerItem()
+                                .withIcon(GoogleMaterial.Icon.gmd_book),
-//                                .withName(R.string.label_recent_updates)
+                        new PrimaryDrawerItem()
-//                                .withIdentifier(R.id.nav_drawer_recent_updates),
+                                .withName(R.string.label_recent_updates)
+                                .withIdentifier(R.id.nav_drawer_recent_updates)
+                                .withIcon(GoogleMaterial.Icon.gmd_update),
                         new PrimaryDrawerItem()
                                 .withName(R.string.label_catalogues)
-                                .withIdentifier(R.id.nav_drawer_catalogues),
+                                .withIdentifier(R.id.nav_drawer_catalogues)
+
+                                .withIcon(GoogleMaterial.Icon.gmd_explore),
                         new PrimaryDrawerItem()
                                 .withName(R.string.label_download_queue)
-                                .withIdentifier(R.id.nav_drawer_downloads),
+                                .withIdentifier(R.id.nav_drawer_downloads)
+                                .withIcon(GoogleMaterial.Icon.gmd_file_download),
+                        new DividerDrawerItem(),
                         new PrimaryDrawerItem()
                                 .withName(R.string.label_settings)
                                 .withIdentifier(R.id.nav_drawer_settings)
                                 .withSelectable(false)
+                                .withIcon(GoogleMaterial.Icon.gmd_settings)
                 )
                 .withSavedInstance(savedState)
                 .withOnDrawerItemClickListener(

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.java

@@ -1,12 +1,17 @@
 package eu.kanade.tachiyomi.ui.manga;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 
@@ -14,6 +19,7 @@ import javax.inject.Inject;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
+import de.greenrobot.event.EventBus;
 import eu.kanade.tachiyomi.App;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.Manga;
@@ -30,21 +36,21 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
 
     @Bind(R.id.toolbar) Toolbar toolbar;
     @Bind(R.id.tabs) TabLayout tabs;
-    @Bind(R.id.view_pager) ViewPager view_pager;
+    @Bind(R.id.view_pager) ViewPager viewPager;
 
     @Inject PreferencesHelper preferences;
     @Inject MangaSyncManager mangaSyncManager;
 
     private MangaDetailAdapter adapter;
-    private long manga_id;
+    private boolean isOnline;
-    private boolean is_online;
 
-    public final static String MANGA_ID = "manga_id";
     public final static String MANGA_ONLINE = "manga_online";
 
     public static Intent newIntent(Context context, Manga manga) {
         Intent intent = new Intent(context, MangaActivity.class);
-        intent.putExtra(MANGA_ID, manga.id);
+        if (manga != null) {
+            EventBus.getDefault().postSticky(manga);
+        }
         return intent;
     }
 
@@ -59,23 +65,21 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
 
         Intent intent = getIntent();
 
-        manga_id = intent.getLongExtra(MANGA_ID, -1);
+        isOnline = intent.getBooleanExtra(MANGA_ONLINE, false);
-        is_online = intent.getBooleanExtra(MANGA_ONLINE, false);
 
         setupViewPager();
 
-        if (savedState == null)
+        requestPermissionsOnMarshmallow();
-            getPresenter().queryManga(manga_id);
     }
 
     private void setupViewPager() {
         adapter = new MangaDetailAdapter(getSupportFragmentManager(), this);
 
-        view_pager.setAdapter(adapter);
+        viewPager.setAdapter(adapter);
-        tabs.setupWithViewPager(view_pager);
+        tabs.setupWithViewPager(viewPager);
 
-        if (!is_online)
+        if (!isOnline)
-            view_pager.setCurrentItem(MangaDetailAdapter.CHAPTERS_FRAGMENT);
+            viewPager.setCurrentItem(MangaDetailAdapter.CHAPTERS_FRAGMENT);
     }
 
     public void setManga(Manga manga) {
@@ -83,7 +87,22 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
     }
 
     public boolean isCatalogueManga() {
-        return is_online;
+        return isOnline;
+    }
+
+    private void requestPermissionsOnMarshmallow() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (ContextCompat.checkSelfPermission(this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                    != PackageManager.PERMISSION_GRANTED) {
+
+                ActivityCompat.requestPermissions(this,
+                        new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                                Manifest.permission.READ_EXTERNAL_STORAGE},
+                        1);
+
+            }
+        }
     }
 
     class MangaDetailAdapter extends FragmentPagerAdapter {
@@ -104,7 +123,7 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
             };
 
             pageCount = 2;
-            if (!is_online && mangaSyncManager.getMyAnimeList().isLogged())
+            if (!isOnline && mangaSyncManager.getMyAnimeList().isLogged())
                 pageCount++;
         }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.java

@@ -7,44 +7,48 @@ import javax.inject.Inject;
 import de.greenrobot.event.EventBus;
 import eu.kanade.tachiyomi.data.database.DatabaseHelper;
 import eu.kanade.tachiyomi.data.database.models.Manga;
+import eu.kanade.tachiyomi.event.MangaEvent;
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter;
+import eu.kanade.tachiyomi.util.EventBusHook;
 import icepick.State;
 import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class MangaPresenter extends BasePresenter<MangaActivity> {
 
     @Inject DatabaseHelper db;
 
-    @State long mangaId;
+    @State Manga manga;
 
-    private static final int DB_MANGA = 1;
+    private static final int GET_MANGA = 1;
 
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
-        restartableLatestCache(DB_MANGA, this::getDbMangaObservable, MangaActivity::setManga);
+        restartableLatestCache(GET_MANGA, this::getMangaObservable, MangaActivity::setManga);
+
+        if (savedState == null)
+            registerForStickyEvents();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
         // Avoid new instances receiving wrong manga
-        EventBus.getDefault().removeStickyEvent(Manga.class);
+        EventBus.getDefault().removeStickyEvent(MangaEvent.class);
     }
 
-    private Observable<Manga> getDbMangaObservable() {
+    private Observable<Manga> getMangaObservable() {
-        return db.getManga(mangaId).asRxObservable()
+        return Observable.just(manga)
-                .subscribeOn(Schedulers.io())
+                .doOnNext(manga -> EventBus.getDefault().postSticky(new MangaEvent(manga)));
-                .observeOn(AndroidSchedulers.mainThread())
-                .doOnNext(manga -> EventBus.getDefault().postSticky(manga));
     }
 
-    public void queryManga(long mangaId) {
+    @EventBusHook
-        this.mangaId = mangaId;
+    public void onEventMainThread(Manga manga) {
-        start(DB_MANGA);
+        EventBus.getDefault().removeStickyEvent(manga);
+        unregisterForEvents();
+        this.manga = manga;
+        start(GET_MANGA);
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.java

@@ -10,6 +10,7 @@ import java.util.List;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.Chapter;
+import eu.kanade.tachiyomi.data.database.models.Manga;
 
 public class ChaptersAdapter extends FlexibleAdapter<ChaptersHolder, Chapter> {
 
@@ -33,7 +34,8 @@ public class ChaptersAdapter extends FlexibleAdapter<ChaptersHolder, Chapter> {
     @Override
     public void onBindViewHolder(ChaptersHolder holder, int position) {
         final Chapter chapter = getItem(position);
-        holder.onSetValues(fragment.getActivity(), chapter);
+        final Manga manga = fragment.getPresenter().getManga();
+        holder.onSetValues(chapter, manga);
 
         //When user scrolls this bind the correct selection status
         holder.itemView.setActivated(isSelected(position));

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.java

@@ -10,6 +10,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +25,7 @@ import butterknife.Bind;
 import butterknife.ButterKnife;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.Chapter;
+import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.download.DownloadService;
 import eu.kanade.tachiyomi.data.download.model.Download;
 import eu.kanade.tachiyomi.ui.base.adapter.FlexibleViewHolder;
@@ -61,6 +63,12 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
         return new ChaptersFragment();
     }
 
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -71,26 +79,14 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
         // Init RecyclerView and adapter
         linearLayout = new LinearLayoutManager(getActivity());
         recyclerView.setLayoutManager(linearLayout);
-        recyclerView.addItemDecoration(new DividerItemDecoration(ContextCompat.getDrawable(getContext(), R.drawable.line_divider)));
+        recyclerView.addItemDecoration(new DividerItemDecoration(
+                ContextCompat.getDrawable(getContext(), R.drawable.line_divider)));
         recyclerView.setHasFixedSize(true);
         adapter = new ChaptersAdapter(this);
         recyclerView.setAdapter(adapter);
 
-        // Set initial values
-        setReadFilter();
-        setDownloadedFilter();
-        setSortIcon();
-
-        // Init listeners
         swipeRefresh.setOnRefreshListener(this::fetchChapters);
-        readCb.setOnCheckedChangeListener((arg, isChecked) ->
+
-                getPresenter().setReadFilter(isChecked));
-        downloadedCb.setOnCheckedChangeListener((v, isChecked) ->
-                getPresenter().setDownloadedFilter(isChecked));
-        sortBtn.setOnClickListener(v -> {
-            getPresenter().revertSortOrder();
-            setSortIcon();
-        });
         nextUnreadBtn.setOnClickListener(v -> {
             Chapter chapter = getPresenter().getNextUnreadChapter();
             if (chapter != null) {
@@ -104,15 +100,40 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
     }
 
     @Override
-    public void onResume() {
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onResume();
+        inflater.inflate(R.menu.chapters, menu);
-        observeChapterDownloadProgress();
     }
 
     @Override
-    public void onPause() {
+    public boolean onOptionsItemSelected(MenuItem item) {
-        unsubscribeChapterDownloadProgress();
+        switch (item.getItemId()) {
-        super.onPause();
+            case R.id.action_display_mode:
+                showDisplayModeDialog();
+                return true;
+        }
+        return false;
+    }
+
+    public void onNextManga(Manga manga) {
+        // Remove listeners before setting the values
+        readCb.setOnCheckedChangeListener(null);
+        downloadedCb.setOnCheckedChangeListener(null);
+        sortBtn.setOnClickListener(null);
+
+        // Set initial values
+        setReadFilter();
+        setDownloadedFilter();
+        setSortIcon();
+
+        // Init listeners
+        readCb.setOnCheckedChangeListener((arg, isChecked) ->
+                getPresenter().setReadFilter(isChecked));
+        downloadedCb.setOnCheckedChangeListener((v, isChecked) ->
+                getPresenter().setDownloadedFilter(isChecked));
+        sortBtn.setOnClickListener(v -> {
+            getPresenter().revertSortOrder();
+            setSortIcon();
+        });
     }
 
     public void onNextChapters(List<Chapter> chapters) {
@@ -158,6 +179,29 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
         startActivity(intent);
     }
 
+    private void showDisplayModeDialog() {
+        final Manga manga = getPresenter().getManga();
+        if (manga == null)
+            return;
+
+        // Get available modes, ids and the selected mode
+        String[] modes = {getString(R.string.show_title), getString(R.string.show_chapter_number)};
+        int[] ids = {Manga.DISPLAY_NAME, Manga.DISPLAY_NUMBER};
+        int selectedIndex = manga.getDisplayMode() == Manga.DISPLAY_NAME ? 0 : 1;
+
+        new MaterialDialog.Builder(getActivity())
+                .items(modes)
+                .itemsIds(ids)
+                .itemsCallbackSingleChoice(selectedIndex, (dialog, itemView, which, text) -> {
+                    // Save the new display mode
+                    getPresenter().setDisplayMode(itemView.getId());
+                    // Refresh ui
+                    adapter.notifyDataSetChanged();
+                    return true;
+                })
+                .show();
+    }
+
     private void observeChapterDownloadProgress() {
         downloadProgressSubscription = getPresenter().getDownloadProgressObs()
                 .subscribe(this::onDownloadProgressChange,
@@ -175,10 +219,10 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
             holder.onProgressChange(getContext(), download.downloadedImages, download.pages.size());
     }
 
-    public void onChapterStatusChange(Chapter chapter) {
+    public void onChapterStatusChange(Download download) {
-        ChaptersHolder holder = getHolder(chapter);
+        ChaptersHolder holder = getHolder(download.chapter);
         if (holder != null)
-            holder.onStatusChange(chapter.status);
+            holder.onStatusChange(download.getStatus());
     }
 
     @Nullable
@@ -342,13 +386,13 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
 
     public void setReadFilter() {
         if (readCb != null) {
-            readCb.setChecked(getPresenter().getReadFilter());
+            readCb.setChecked(getPresenter().onlyUnread());
         }
     }
 
     public void setDownloadedFilter() {
         if (downloadedCb != null) {
-            downloadedCb.setChecked(getPresenter().getDownloadedFilter());
+            downloadedCb.setChecked(getPresenter().onlyDownloaded());
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersHolder.java

@@ -7,6 +7,8 @@ import android.widget.PopupMenu;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -14,40 +16,61 @@ import butterknife.Bind;
 import butterknife.ButterKnife;
 import eu.kanade.tachiyomi.R;
 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.ui.base.adapter.FlexibleViewHolder;
 import rx.Observable;
 
 public class ChaptersHolder extends FlexibleViewHolder {
 
-    private final ChaptersAdapter adapter;
-    private Chapter item;
-
     @Bind(R.id.chapter_title) TextView title;
     @Bind(R.id.download_text) TextView downloadText;
     @Bind(R.id.chapter_menu) RelativeLayout chapterMenu;
     @Bind(R.id.chapter_pages) TextView pages;
     @Bind(R.id.chapter_date) TextView date;
 
-    SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+    private Context context;
+
+    private final ChaptersAdapter adapter;
+    private Chapter item;
+
+    private final int readColor;
+    private final int unreadColor;
+
+    private final DecimalFormat decimalFormat;
+    private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 
     public ChaptersHolder(View view, ChaptersAdapter adapter, OnListItemClickListener listener) {
         super(view, adapter, listener);
         this.adapter = adapter;
+        context = view.getContext();
         ButterKnife.bind(this, view);
 
+        readColor = ContextCompat.getColor(view.getContext(), R.color.hint_text);
+        unreadColor = ContextCompat.getColor(view.getContext(), R.color.primary_text);
+
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+        symbols.setDecimalSeparator('.');
+        decimalFormat = new DecimalFormat("#.###", symbols);
+
         chapterMenu.setOnClickListener(v -> v.post(() -> showPopupMenu(v)));
     }
 
-    public void onSetValues(Context context, Chapter chapter) {
+    public void onSetValues(Chapter chapter, Manga manga) {
         this.item = chapter;
-        title.setText(chapter.name);
+        String name;
-
+        switch (manga.getDisplayMode()) {
-        if (chapter.read) {
+            case Manga.DISPLAY_NAME:
-            title.setTextColor(ContextCompat.getColor(context, R.color.hint_text));
+            default:
-        } else {
+                name = chapter.name;
-            title.setTextColor(ContextCompat.getColor(context, R.color.primary_text));
+                break;
+            case Manga.DISPLAY_NUMBER:
+                String formattedNumber = decimalFormat.format(chapter.chapter_number);
+                name = context.getString(R.string.display_mode_chapter, formattedNumber);
+                break;
         }
+        title.setText(name);
+        title.setTextColor(chapter.read ? readColor : unreadColor);
 
         if (!chapter.read && chapter.last_page_read > 0) {
             pages.setText(context.getString(R.string.chapter_progress, chapter.last_page_read + 1));

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.java

@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.data.source.SourceManager;
 import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.event.ChapterCountEvent;
 import eu.kanade.tachiyomi.event.DownloadChaptersEvent;
+import eu.kanade.tachiyomi.event.MangaEvent;
 import eu.kanade.tachiyomi.event.ReaderEvent;
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter;
 import eu.kanade.tachiyomi.util.EventBusHook;
@@ -38,16 +39,14 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
     private Manga manga;
     private Source source;
     private List<Chapter> chapters;
-    private boolean sortOrderAToZ = true;
-    private boolean onlyUnread = true;
-    private boolean onlyDownloaded;
     @State boolean hasRequested;
 
     private PublishSubject<List<Chapter>> chaptersSubject;
 
-    private static final int DB_CHAPTERS = 1;
+    private static final int GET_MANGA = 1;
-    private static final int FETCH_CHAPTERS = 2;
+    private static final int DB_CHAPTERS = 2;
-    private static final int CHAPTER_STATUS_CHANGES = 3;
+    private static final int FETCH_CHAPTERS = 3;
+    private static final int CHAPTER_STATUS_CHANGES = 4;
 
     @Override
     protected void onCreate(Bundle savedState) {
@@ -59,6 +58,10 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
 
         chaptersSubject = PublishSubject.create();
 
+        restartableLatestCache(GET_MANGA,
+                () -> Observable.just(manga),
+                ChaptersFragment::onNextManga);
+
         restartableLatestCache(DB_CHAPTERS,
                 this::getDbChaptersObs,
                 ChaptersFragment::onNextChapters);
@@ -70,13 +73,14 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
 
         restartableLatestCache(CHAPTER_STATUS_CHANGES,
                 this::getChapterStatusObs,
-                (view, download) -> view.onChapterStatusChange(download.chapter),
+                (view, download) -> view.onChapterStatusChange(download),
                 (view, error) -> Timber.e(error.getCause(), error.getMessage()));
 
         registerForStickyEvents();
     }
 
     private void onProcessRestart() {
+        stop(GET_MANGA);
         stop(DB_CHAPTERS);
         stop(FETCH_CHAPTERS);
         stop(CHAPTER_STATUS_CHANGES);
@@ -90,10 +94,11 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
     }
 
     @EventBusHook
-    public void onEventMainThread(Manga manga) {
+    public void onEventMainThread(MangaEvent event) {
-        this.manga = manga;
+        this.manga = event.manga;
+        start(GET_MANGA);
 
-        if (!isSubscribed(DB_CHAPTERS)) {
+        if (isUnsubscribed(DB_CHAPTERS)) {
             source = sourceManager.get(manga.source);
             start(DB_CHAPTERS);
 
@@ -135,13 +140,13 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
     private Observable<List<Chapter>> applyChapterFilters(List<Chapter> chapters) {
         Observable<Chapter> observable = Observable.from(chapters)
                 .subscribeOn(Schedulers.io());
-        if (onlyUnread) {
+        if (onlyUnread()) {
             observable = observable.filter(chapter -> !chapter.read);
         }
-        if (onlyDownloaded) {
+        if (onlyDownloaded()) {
             observable = observable.filter(chapter -> chapter.status == Download.DOWNLOADED);
         }
-        return observable.toSortedList((chapter, chapter2) -> sortOrderAToZ ?
+        return observable.toSortedList((chapter, chapter2) -> getSortOrder() ?
                 Float.compare(chapter2.chapter_number, chapter.chapter_number) :
                 Float.compare(chapter.chapter_number, chapter2.chapter_number));
     }
@@ -175,7 +180,7 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
                 break;
             }
         }
-        if (onlyDownloaded && download.getStatus() == Download.DOWNLOADED)
+        if (onlyDownloaded() && download.getStatus() == Download.DOWNLOADED)
             refreshChapters();
     }
 
@@ -231,7 +236,7 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
                 }, error -> {
                     Timber.e(error.getMessage());
                 }, () -> {
-                    if (onlyDownloaded)
+                    if (onlyDownloaded())
                         refreshChapters();
                 }));
     }
@@ -241,32 +246,38 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
     }
 
     public void revertSortOrder() {
-        //TODO manga.chapter_order
+        manga.setChapterOrder(getSortOrder() ? Manga.SORT_ZA : Manga.SORT_AZ);
-        sortOrderAToZ = !sortOrderAToZ;
+        db.insertManga(manga).executeAsBlocking();
         refreshChapters();
     }
 
     public void setReadFilter(boolean onlyUnread) {
-        //TODO do we need save filter for manga?
+        manga.setReadFilter(onlyUnread ? Manga.SHOW_UNREAD : Manga.SHOW_ALL);
-        this.onlyUnread = onlyUnread;
+        db.insertManga(manga).executeAsBlocking();
         refreshChapters();
     }
 
     public void setDownloadedFilter(boolean onlyDownloaded) {
-        this.onlyDownloaded = onlyDownloaded;
+        manga.setDownloadedFilter(onlyDownloaded ? Manga.SHOW_DOWNLOADED : Manga.SHOW_ALL);
+        db.insertManga(manga).executeAsBlocking();
         refreshChapters();
     }
 
+    public void setDisplayMode(int mode) {
+        manga.setDisplayMode(mode);
+        db.insertManga(manga).executeAsBlocking();
+    }
+
+    public boolean onlyDownloaded() {
+        return manga.getDownloadedFilter() == Manga.SHOW_DOWNLOADED;
+    }
+
+    public boolean onlyUnread() {
+        return manga.getReadFilter() == Manga.SHOW_UNREAD;
+    }
+
     public boolean getSortOrder() {
-        return sortOrderAToZ;
+        return manga.sortChaptersAZ();
-    }
-
-    public boolean getReadFilter() {
-        return onlyUnread;
-    }
-
-    public boolean getDownloadedFilter() {
-        return onlyDownloaded;
     }
 
     public Manga getManga() {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.java

@@ -1,6 +1,11 @@
 package eu.kanade.tachiyomi.ui.manga.info;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,30 +15,38 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.load.model.LazyHeaders;
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.mikepenz.iconics.IconicsDrawable;
+
+import java.io.File;
+import java.io.IOException;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.cache.CoverCache;
 import eu.kanade.tachiyomi.data.database.models.Manga;
+import eu.kanade.tachiyomi.data.io.IOHandler;
+import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment;
+import eu.kanade.tachiyomi.util.ToastUtil;
 import nucleus.factory.RequiresPresenter;
 
 @RequiresPresenter(MangaInfoPresenter.class)
 public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
 
+    private static final int REQUEST_IMAGE_OPEN = 101;
     @Bind(R.id.swipe_refresh) SwipeRefreshLayout swipeRefresh;
-
     @Bind(R.id.manga_artist) TextView artist;
     @Bind(R.id.manga_author) TextView author;
     @Bind(R.id.manga_chapters) TextView chapterCount;
     @Bind(R.id.manga_genres) TextView genres;
     @Bind(R.id.manga_status) TextView status;
+    @Bind(R.id.manga_source) TextView source;
     @Bind(R.id.manga_summary) TextView description;
     @Bind(R.id.manga_cover) ImageView cover;
-
     @Bind(R.id.action_favorite) Button favoriteBtn;
-
+    @Bind(R.id.fab_edit) FloatingActionButton fabEdit;
 
     public static MangaInfoFragment newInstance() {
         return new MangaInfoFragment();
@@ -52,26 +65,47 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
         View view = inflater.inflate(R.layout.fragment_manga_info, container, false);
         ButterKnife.bind(this, view);
 
-        favoriteBtn.setOnClickListener(v -> {
+        //Create edit drawable with size 24dp (google guidelines)
-            getPresenter().toggleFavorite();
+        IconicsDrawable edit = new IconicsDrawable(this.getContext())
-        });
+                .icon(GoogleMaterial.Icon.gmd_edit)
+                .color(ContextCompat.getColor(this.getContext(), R.color.white))
+                .sizeDp(24);
+
+        // Update image of fab button
+        fabEdit.setImageDrawable(edit);
+
+        // Set listener.
+        fabEdit.setOnClickListener(v -> selectImage());
+
+        favoriteBtn.setOnClickListener(v -> getPresenter().toggleFavorite());
+
         swipeRefresh.setOnRefreshListener(this::fetchMangaFromSource);
 
         return view;
     }
 
-    public void onNextManga(Manga manga) {
+    public void onNextManga(Manga manga, Source source) {
         if (manga.initialized) {
-            setMangaInfo(manga);
+            setMangaInfo(manga, source);
         } else {
             // Initialize manga
             fetchMangaFromSource();
         }
     }
 
-    private void setMangaInfo(Manga manga) {
+    /**
+     * Set the info of the manga
+     *
+     * @param manga       manga object containing information about manga
+     * @param mangaSource the source of the manga
+     */
+    private void setMangaInfo(Manga manga, Source mangaSource) {
         artist.setText(manga.artist);
         author.setText(manga.author);
+
+        if (mangaSource != null) {
+            source.setText(mangaSource.getName());
+        }
         genres.setText(manga.genre);
         status.setText(manga.getStatus(getActivity()));
         description.setText(manga.description);
@@ -82,7 +116,7 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
         LazyHeaders headers = getPresenter().source.getGlideHeaders();
         if (manga.thumbnail_url != null && cover.getDrawable() == null) {
             if (manga.favorite) {
-                coverCache.saveAndLoadFromCache(cover, manga.thumbnail_url, headers);
+                coverCache.saveOrLoadFromCache(cover, manga.thumbnail_url, headers);
             } else {
                 coverCache.loadFromNetwork(cover, manga.thumbnail_url, headers);
             }
@@ -93,7 +127,7 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
         chapterCount.setText(String.valueOf(count));
     }
 
-    public void setFavoriteText(boolean isFavorite) {
+    private void setFavoriteText(boolean isFavorite) {
         favoriteBtn.setText(!isFavorite ? R.string.add_to_library : R.string.remove_from_library);
     }
 
@@ -102,6 +136,44 @@ public class MangaInfoFragment extends BaseRxFragment<MangaInfoPresenter> {
         getPresenter().fetchMangaFromSource();
     }
 
+    private void selectImage() {
+        if (getPresenter().getManga().favorite) {
+
+            Intent intent = new Intent();
+            intent.setType("image/*");
+            intent.setAction(Intent.ACTION_GET_CONTENT);
+            startActivityForResult(Intent.createChooser(intent,
+                    getString(R.string.file_select_cover)), REQUEST_IMAGE_OPEN);
+        } else {
+            ToastUtil.showShort(getContext(), R.string.notification_first_add_to_library);
+        }
+
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_IMAGE_OPEN) {
+            // Get the file's content URI from the incoming Intent
+            Uri selectedImageUri = data.getData();
+
+            // Convert to absolute path to prevent FileNotFoundException
+            String result = IOHandler.getFilePath(selectedImageUri,
+                    getContext().getContentResolver(), getContext());
+
+            // Get file from filepath
+            File picture = new File(result != null ? result : "");
+
+            try {
+                // Update cover to selected file, show error if something went wrong
+                if (!getPresenter().editCoverWithLocalFile(picture, cover))
+                    ToastUtil.showShort(getContext(), R.string.notification_manga_update_failed);
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     public void onFetchMangaDone() {
         setRefreshing(false);
     }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.java

@@ -1,6 +1,10 @@
 package eu.kanade.tachiyomi.ui.manga.info;
 
 import android.os.Bundle;
+import android.widget.ImageView;
+
+import java.io.File;
+import java.io.IOException;
 
 import javax.inject.Inject;
 
@@ -10,6 +14,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.source.SourceManager;
 import eu.kanade.tachiyomi.data.source.base.Source;
 import eu.kanade.tachiyomi.event.ChapterCountEvent;
+import eu.kanade.tachiyomi.event.MangaEvent;
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter;
 import eu.kanade.tachiyomi.util.EventBusHook;
 import rx.Observable;
@@ -18,19 +23,42 @@ import rx.schedulers.Schedulers;
 
 public class MangaInfoPresenter extends BasePresenter<MangaInfoFragment> {
 
-    @Inject DatabaseHelper db;
+    /**
-    @Inject SourceManager sourceManager;
+     * The id of the restartable.
-    @Inject CoverCache coverCache;
+     */
-
-    private Manga manga;
-    protected Source source;
-    private int count = -1;
-
-    private boolean isFetching;
-
     private static final int GET_MANGA = 1;
+    /**
+     * The id of the restartable.
+     */
     private static final int GET_CHAPTER_COUNT = 2;
+    /**
+     * The id of the restartable.
+     */
     private static final int FETCH_MANGA_INFO = 3;
+    /**
+     * Source information
+     */
+    protected Source source;
+    /**
+     * Used to connect to database
+     */
+    @Inject DatabaseHelper db;
+    /**
+     * Used to connect to different manga sources
+     */
+    @Inject SourceManager sourceManager;
+    /**
+     * Used to connect to cache
+     */
+    @Inject CoverCache coverCache;
+    /**
+     * Selected manga information
+     */
+    private Manga manga;
+    /**
+     * Count of chapters
+     */
+    private int count = -1;
 
     @Override
     protected void onCreate(Bundle savedState) {
@@ -40,22 +68,29 @@ public class MangaInfoPresenter extends BasePresenter<MangaInfoFragment> {
             onProcessRestart();
         }
 
+        // Update manga cache
         restartableLatestCache(GET_MANGA,
                 () -> Observable.just(manga),
-                MangaInfoFragment::onNextManga);
+                (view, manga) -> view.onNextManga(manga, source));
 
+        // Update chapter count
         restartableLatestCache(GET_CHAPTER_COUNT,
                 () -> Observable.just(count),
                 MangaInfoFragment::setChapterCount);
 
+        // Fetch manga info from source
         restartableFirst(FETCH_MANGA_INFO,
                 this::fetchMangaObs,
                 (view, manga) -> view.onFetchMangaDone(),
                 (view, error) -> view.onFetchMangaError());
 
+        // onEventMainThread receives an event thanks to this line.
         registerForStickyEvents();
     }
 
+    /**
+     * Called when savedState not null
+     */
     private void onProcessRestart() {
         stop(GET_MANGA);
         stop(GET_CHAPTER_COUNT);
@@ -69,10 +104,10 @@ public class MangaInfoPresenter extends BasePresenter<MangaInfoFragment> {
     }
 
     @EventBusHook
-    public void onEventMainThread(Manga manga) {
+    public void onEventMainThread(MangaEvent event) {
-        this.manga = manga;
+        this.manga = event.manga;
         source = sourceManager.get(manga.source);
-        start(GET_MANGA);
+        refreshManga();
     }
 
     @EventBusHook
@@ -83,9 +118,11 @@ public class MangaInfoPresenter extends BasePresenter<MangaInfoFragment> {
         }
     }
 
+    /**
+     * Fetch manga info from source
+     */
     public void fetchMangaFromSource() {
-        if (!isFetching) {
+        if (isUnsubscribed(FETCH_MANGA_INFO)) {
-            isFetching = true;
             start(FETCH_MANGA_INFO);
         }
     }
@@ -97,23 +134,48 @@ public class MangaInfoPresenter extends BasePresenter<MangaInfoFragment> {
                     db.insertManga(manga).executeAsBlocking();
                     return Observable.just(manga);
                 })
-                .finallyDo(() -> isFetching = false)
                 .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread());
+                .observeOn(AndroidSchedulers.mainThread())
+                .doOnNext(manga -> refreshManga());
     }
 
     public void toggleFavorite() {
         manga.favorite = !manga.favorite;
         onMangaFavoriteChange(manga.favorite);
         db.insertManga(manga).executeAsBlocking();
+        refreshManga();
+    }
+
+    /**
+     * Update cover with local file
+     */
+    public boolean editCoverWithLocalFile(File file, ImageView imageView) throws IOException {
+        if (!manga.initialized)
+            return false;
+
+        if (manga.favorite) {
+            coverCache.copyToLocalCache(manga.thumbnail_url, file);
+            coverCache.saveOrLoadFromCache(imageView, manga.thumbnail_url, source.getGlideHeaders());
+            return true;
+        }
+        return false;
     }
 
     private void onMangaFavoriteChange(boolean isFavorite) {
         if (isFavorite) {
             coverCache.save(manga.thumbnail_url, source.getGlideHeaders());
         } else {
-            coverCache.delete(manga.thumbnail_url);
+            coverCache.deleteCoverFromCache(manga.thumbnail_url);
         }
     }
 
+    public Manga getManga() {
+        return manga;
+    }
+
+    // Used to refresh the view
+    protected void refreshManga() {
+        start(GET_MANGA);
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/myanimelist/MyAnimeListPresenter.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import java.util.List;
+
 import javax.inject.Inject;
 
 import eu.kanade.tachiyomi.R;
@@ -12,6 +14,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga;
 import eu.kanade.tachiyomi.data.database.models.MangaSync;
 import eu.kanade.tachiyomi.data.mangasync.MangaSyncManager;
 import eu.kanade.tachiyomi.data.mangasync.services.MyAnimeList;
+import eu.kanade.tachiyomi.event.MangaEvent;
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter;
 import eu.kanade.tachiyomi.util.EventBusHook;
 import eu.kanade.tachiyomi.util.ToastUtil;
@@ -35,6 +38,8 @@ public class MyAnimeListPresenter extends BasePresenter<MyAnimeListFragment> {
     private static final int GET_SEARCH_RESULTS = 2;
     private static final int REFRESH = 3;
 
+    private static final String PREFIX_MY = "my:";
+
     @Override
     protected void onCreate(Bundle savedState) {
         super.onCreate(savedState);
@@ -53,9 +58,7 @@ public class MyAnimeListPresenter extends BasePresenter<MyAnimeListFragment> {
                 MyAnimeListFragment::setMangaSync);
 
         restartableLatestCache(GET_SEARCH_RESULTS,
-                () -> myAnimeList.search(query)
+                this::getSearchResultsObservable,
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread()),
                 (view, results) -> {
                     view.setSearchResults(results);
                 }, (view, error) -> {
@@ -102,11 +105,27 @@ public class MyAnimeListPresenter extends BasePresenter<MyAnimeListFragment> {
     }
 
     @EventBusHook
-    public void onEventMainThread(Manga manga) {
+    public void onEventMainThread(MangaEvent event) {
-        this.manga = manga;
+        this.manga = event.manga;
         start(GET_MANGA_SYNC);
     }
 
+    private Observable<List<MangaSync>> getSearchResultsObservable() {
+        Observable<List<MangaSync>> observable;
+        if (query.startsWith(PREFIX_MY)) {
+            String realQuery = query.substring(PREFIX_MY.length()).toLowerCase().trim();
+            observable = myAnimeList.getList()
+                    .flatMap(Observable::from)
+                    .filter(manga -> manga.title.toLowerCase().contains(realQuery))
+                    .toList();
+        } else {
+            observable = myAnimeList.search(query);
+        }
+        return observable
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
     private void updateRemote() {
         add(myAnimeList.update(mangaSync)
                 .flatMap(response -> db.insertMangaSync(mangaSync).asRxObservable())

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.java

@@ -7,6 +7,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
@@ -20,11 +21,8 @@ import com.afollestad.materialdialogs.MaterialDialog;
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import eu.kanade.tachiyomi.App;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.Chapter;
 import eu.kanade.tachiyomi.data.database.models.Manga;
@@ -49,8 +47,6 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     @Bind(R.id.page_number) TextView pageNumber;
     @Bind(R.id.toolbar) Toolbar toolbar;
 
-    @Inject PreferencesHelper preferences;
-
     private BaseReader viewer;
     private ReaderMenu readerMenu;
 
@@ -75,7 +71,6 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
-        App.get(this).getComponent().inject(this);
         setContentView(R.layout.activity_reader);
         ButterKnife.bind(this);
 
@@ -164,9 +159,12 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     }
 
     public void onChapterReady(List<Page> pages, Manga manga, Chapter chapter, int currentPage) {
+        if (currentPage == -1) {
+            currentPage = pages.size() - 1;
+        }
+
         if (viewer == null) {
-            viewer = createViewer(manga);
+            viewer = getOrCreateViewer(manga);
-            getSupportFragmentManager().beginTransaction().replace(R.id.reader, viewer).commit();
         }
         viewer.onPageListReady(pages, currentPage);
         readerMenu.onChapterReady(pages.size(), manga, chapter, currentPage);
@@ -176,19 +174,33 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
         readerMenu.onAdjacentChapters(previous, next);
     }
 
-    private BaseReader createViewer(Manga manga) {
+    private BaseReader getOrCreateViewer(Manga manga) {
-        int mangaViewer = manga.viewer == 0 ? preferences.getDefaultViewer() : manga.viewer;
+        int mangaViewer = manga.viewer == 0 ? getPreferences().getDefaultViewer() : manga.viewer;
 
+        FragmentManager fm = getSupportFragmentManager();
+
+        // Try to reuse the viewer using its tag
+        BaseReader fragment = (BaseReader) fm.findFragmentByTag(manga.viewer + "");
+        if (fragment == null) {
+            // Create a new viewer
             switch (mangaViewer) {
                 case LEFT_TO_RIGHT: default:
-                return new LeftToRightReader();
+                    fragment = new LeftToRightReader();
+                    break;
                 case RIGHT_TO_LEFT:
-                return new RightToLeftReader();
+                    fragment = new RightToLeftReader();
+                    break;
                 case VERTICAL:
-                return new VerticalReader();
+                    fragment = new VerticalReader();
+                    break;
                 case WEBTOON:
-                return new WebtoonReader();
+                    fragment = new WebtoonReader();
+                    break;
             }
+
+            fm.beginTransaction().replace(R.id.reader, fragment, manga.viewer + "").commit();
+        }
+        return fragment;
     }
 
     public void onPageChanged(int currentPageIndex, int totalPages) {
@@ -221,6 +233,8 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     }
 
     private void initializeSettings() {
+        PreferencesHelper preferences = getPreferences();
+
         subscriptions.add(preferences.showPageNumber()
                 .asObservable()
                 .subscribe(this::setPageNumberVisibility));
@@ -286,7 +300,7 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
 
     private void setCustomBrightness(boolean enabled) {
         if (enabled) {
-            subscriptions.add(customBrightnessSubscription = preferences.customBrightnessValue()
+            subscriptions.add(customBrightnessSubscription = getPreferences().customBrightnessValue()
                     .asObservable()
                     .subscribe(this::setCustomBrightnessValue));
         } else {
@@ -344,7 +358,7 @@ public class ReaderActivity extends BaseRxActivity<ReaderPresenter> {
     }
 
     public PreferencesHelper getPreferences() {
-        return preferences;
+        return getPresenter().prefs;
     }
 
     public BaseReader getViewer() {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderMenu.java

@@ -7,6 +7,7 @@ import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
 import android.view.animation.Animation;
@@ -44,7 +45,7 @@ public class ReaderMenu {
     @Bind(R.id.lock_orientation) ImageButton lockOrientation;
     @Bind(R.id.reader_selector) ImageButton readerSelector;
     @Bind(R.id.reader_extra_settings) ImageButton extraSettings;
-    @Bind(R.id.reader_brightness) ImageButton brightnessSettings;
+    @Bind(R.id.reader_scale_type_selector) ImageButton scaleTypeSelector;
 
     private MenuItem nextChapterBtn;
     private MenuItem prevChapterBtn;
@@ -56,7 +57,6 @@ public class ReaderMenu {
 
     @State boolean showing;
     private PopupWindow settingsPopup;
-    private PopupWindow brightnessPopup;
     private boolean inverted;
 
     private DecimalFormat decimalFormat;
@@ -70,10 +70,10 @@ public class ReaderMenu {
         bottomMenu.setOnTouchListener((v, event) -> true);
 
         seekBar.setOnSeekBarChangeListener(new PageSeekBarChangeListener());
-        decimalFormat = new DecimalFormat("#.##");
+        decimalFormat = new DecimalFormat("#.###");
         inverted = false;
 
-        initializeOptions();
+        initializeMenu();
     }
 
     public void add(Subscription subscription) {
@@ -110,7 +110,6 @@ public class ReaderMenu {
         bottomMenu.startAnimation(bottomMenuAnimation);
 
         settingsPopup.dismiss();
-        brightnessPopup.dismiss();
 
         showing = false;
     }
@@ -148,8 +147,8 @@ public class ReaderMenu {
         // Set initial values
         totalPages.setText("" + numPages);
         currentPage.setText("" + (currentPageIndex + 1));
-        seekBar.setProgress(currentPageIndex);
         seekBar.setMax(numPages - 1);
+        seekBar.setProgress(currentPageIndex);
 
         activity.setToolbarTitle(manga.title);
         activity.setToolbarSubtitle(chapter.chapter_number != -1 ?
@@ -175,7 +174,7 @@ public class ReaderMenu {
         if (nextChapterBtn != null) nextChapterBtn.setVisible(nextChapter != null);
     }
 
-    private void initializeOptions() {
+    private void initializeMenu() {
         // Orientation changes
         add(preferences.lockOrientation().asObservable()
                 .subscribe(locked -> {
@@ -190,6 +189,18 @@ public class ReaderMenu {
         lockOrientation.setOnClickListener(v ->
                 preferences.lockOrientation().set(!preferences.lockOrientation().get()));
 
+        // Scale type selector
+        scaleTypeSelector.setOnClickListener(v -> {
+            showImmersiveDialog(new MaterialDialog.Builder(activity)
+                    .items(R.array.image_scale_type)
+                    .itemsCallbackSingleChoice(preferences.imageScaleType().get() - 1,
+                            (d, itemView, which, text) -> {
+                                preferences.imageScaleType().set(which + 1);
+                                return true;
+                            })
+                    .build());
+        });
+
         // Reader selector
         readerSelector.setOnClickListener(v -> {
             final Manga manga = activity.getPresenter().getManga();
@@ -215,17 +226,6 @@ public class ReaderMenu {
                 settingsPopup.dismiss();
         });
 
-        // Brightness popup
-        final View brightnessView = activity.getLayoutInflater().inflate(R.layout.reader_brightness, null);
-        brightnessPopup = new BrightnessPopupWindow(brightnessView);
-
-        brightnessSettings.setOnClickListener(v -> {
-            if (!brightnessPopup.isShowing())
-                brightnessPopup.showAtLocation(brightnessSettings,
-                        Gravity.BOTTOM | Gravity.LEFT, 0, bottomMenu.getHeight());
-            else
-                brightnessPopup.dismiss();
-        });
     }
 
     private void showImmersiveDialog(Dialog dialog) {
@@ -247,8 +247,11 @@ public class ReaderMenu {
         @Bind(R.id.hide_status_bar) CheckBox hideStatusBar;
         @Bind(R.id.keep_screen_on) CheckBox keepScreenOn;
         @Bind(R.id.reader_theme) CheckBox readerTheme;
+        @Bind(R.id.image_decoder_container) ViewGroup imageDecoderContainer;
         @Bind(R.id.image_decoder) TextView imageDecoder;
         @Bind(R.id.image_decoder_initial) TextView imageDecoderInitial;
+        @Bind(R.id.custom_brightness) CheckBox customBrightness;
+        @Bind(R.id.brightness_seekbar) SeekBar brightnessSeekbar;
 
         public SettingsPopupWindow(View view) {
             super(view, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
@@ -282,7 +285,7 @@ public class ReaderMenu {
             readerTheme.setOnCheckedChangeListener((view, isChecked) ->
                     preferences.readerTheme().set(isChecked ? 1 : 0));
 
-            imageDecoder.setOnClickListener(v -> {
+            imageDecoderContainer.setOnClickListener(v -> {
                 showImmersiveDialog(new MaterialDialog.Builder(activity)
                         .title(R.string.pref_image_decoder)
                         .items(R.array.image_decoders)
@@ -294,6 +297,21 @@ public class ReaderMenu {
                                 })
                         .build());
             });
+
+            add(preferences.customBrightness()
+                    .asObservable()
+                    .subscribe(isEnabled -> {
+                        customBrightness.setChecked(isEnabled);
+                        brightnessSeekbar.setEnabled(isEnabled);
+                    }));
+
+            customBrightness.setOnCheckedChangeListener((view, isChecked) ->
+                    preferences.customBrightness().set(isChecked));
+
+            brightnessSeekbar.setMax(100);
+            brightnessSeekbar.setProgress(Math.round(
+                    preferences.customBrightnessValue().get() * brightnessSeekbar.getMax()));
+            brightnessSeekbar.setOnSeekBarChangeListener(new BrightnessSeekBarChangeListener());
         }
 
         private void setDecoderInitial(int decoder) {
@@ -314,37 +332,6 @@ public class ReaderMenu {
 
     }
 
-    class BrightnessPopupWindow extends PopupWindow {
-
-        @Bind(R.id.custom_brightness) CheckBox customBrightness;
-        @Bind(R.id.brightness_seekbar) SeekBar brightnessSeekbar;
-
-        public BrightnessPopupWindow(View view) {
-            super(view, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-            setAnimationStyle(R.style.reader_brightness_popup_animation);
-            ButterKnife.bind(this, view);
-            initializePopupMenu();
-        }
-
-        private void initializePopupMenu() {
-            add(preferences.customBrightness()
-                    .asObservable()
-                    .subscribe(isEnabled -> {
-                        customBrightness.setChecked(isEnabled);
-                        brightnessSeekbar.setEnabled(isEnabled);
-                    }));
-
-            customBrightness.setOnCheckedChangeListener((view, isChecked) ->
-                    preferences.customBrightness().set(isChecked));
-
-            brightnessSeekbar.setMax(100);
-            brightnessSeekbar.setProgress(Math.round(
-                    preferences.customBrightnessValue().get() * brightnessSeekbar.getMax()));
-            brightnessSeekbar.setOnSeekBarChangeListener(new BrightnessSeekBarChangeListener());
-        }
-
-    }
-
     class PageSeekBarChangeListener implements SeekBar.OnSeekBarChangeListener {
 
         @Override

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.java

@@ -215,8 +215,12 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
                 .doOnNext(mangaSync -> this.mangaSyncList = mangaSync);
     }
 
-    // Loads the given chapter
     private void loadChapter(Chapter chapter) {
+        loadChapter(chapter, 0);
+    }
+
+    // Loads the given chapter
+    private void loadChapter(Chapter chapter, int requestedPage) {
         // Before loading the chapter, stop preloading (if it's working) and save current progress
         stopPreloadingNextChapter();
 
@@ -227,7 +231,7 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
         if (!chapter.read && chapter.last_page_read != 0)
             currentPage = chapter.last_page_read;
         else
-            currentPage = 0;
+            currentPage = requestedPage;
 
         // Reset next and previous chapter. They have to be fetched again
         nextChapter = null;
@@ -312,7 +316,7 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
     public boolean loadNextChapter() {
         if (hasNextChapter()) {
             onChapterLeft();
-            loadChapter(nextChapter);
+            loadChapter(nextChapter, 0);
             return true;
         }
         return false;
@@ -321,7 +325,7 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
     public boolean loadPreviousChapter() {
         if (hasPreviousChapter()) {
             onChapterLeft();
-            loadChapter(previousChapter);
+            loadChapter(previousChapter, -1);
             return true;
         }
         return false;
@@ -342,7 +346,7 @@ public class ReaderPresenter extends BasePresenter<ReaderActivity> {
     }
 
     private void stopPreloadingNextChapter() {
-        if (isSubscribed(PRELOAD_NEXT_CHAPTER)) {
+        if (!isUnsubscribed(PRELOAD_NEXT_CHAPTER)) {
             stop(PRELOAD_NEXT_CHAPTER);
             if (nextChapterPageList != null)
                 source.savePageList(nextChapter.url, nextChapterPageList);

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.java

@@ -2,8 +2,10 @@ package eu.kanade.tachiyomi.ui.reader.viewer.base;
 
 import android.view.MotionEvent;
 
+import com.davemorrissey.labs.subscaleview.decoder.ImageDecoder;
 import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder;
 import com.davemorrissey.labs.subscaleview.decoder.RapidImageRegionDecoder;
+import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder;
 import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder;
 
 import java.util.List;
@@ -17,6 +19,7 @@ public abstract class BaseReader extends BaseFragment {
     protected int currentPage;
     protected List<Page> pages;
     protected Class<? extends ImageRegionDecoder> regionDecoderClass;
+    protected Class<? extends ImageDecoder> bitmapDecoderClass;
 
     public static final int RAPID_DECODER = 0;
     public static final int SKIA_DECODER = 1;
@@ -50,14 +53,19 @@ public abstract class BaseReader extends BaseFragment {
     public abstract void onPageListReady(List<Page> pages, int currentPage);
     public abstract boolean onImageTouch(MotionEvent motionEvent);
 
-    public void setRegionDecoderClass(int value) {
+    public void setDecoderClass(int value) {
         switch (value) {
             case RAPID_DECODER:
             default:
                 regionDecoderClass = RapidImageRegionDecoder.class;
+                bitmapDecoderClass = SkiaImageDecoder.class;
+                // Using Skia because Rapid isn't stable. Rapid is still used for region decoding.
+                // https://github.com/inorichi/tachiyomi/issues/97
+                //bitmapDecoderClass = RapidImageDecoder.class;
                 break;
             case SKIA_DECODER:
                 regionDecoderClass = SkiaImageRegionDecoder.class;
+                bitmapDecoderClass = SkiaImageDecoder.class;
                 break;
         }
     }
@@ -66,6 +74,10 @@ public abstract class BaseReader extends BaseFragment {
         return regionDecoderClass;
     }
 
+    public Class<? extends ImageDecoder> getBitmapDecoderClass() {
+        return bitmapDecoderClass;
+    }
+
     public ReaderActivity getReaderActivity() {
         return (ReaderActivity) getActivity();
     }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReader.java

@@ -19,9 +19,12 @@ public abstract class PagerReader extends BaseReader {
     protected PagerReaderAdapter adapter;
     protected Pager pager;
 
+    private boolean isReady;
     protected boolean transitions;
     protected CompositeSubscription subscriptions;
 
+    protected int scaleType = 1;
+
     protected void initializePager(Pager pager) {
         this.pager = pager;
         pager.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
@@ -61,7 +64,14 @@ public abstract class PagerReader extends BaseReader {
         subscriptions = new CompositeSubscription();
         subscriptions.add(getReaderActivity().getPreferences().imageDecoder()
                 .asObservable()
-                .doOnNext(this::setRegionDecoderClass)
+                .doOnNext(this::setDecoderClass)
+                .skip(1)
+                .distinctUntilChanged()
+                .subscribe(v -> adapter.notifyDataSetChanged()));
+
+        subscriptions.add(getReaderActivity().getPreferences().imageScaleType()
+                .asObservable()
+                .doOnNext(this::setImageScaleType)
                 .skip(1)
                 .distinctUntilChanged()
                 .subscribe(v -> adapter.notifyDataSetChanged()));
@@ -71,6 +81,7 @@ public abstract class PagerReader extends BaseReader {
                 .subscribe(value -> transitions = value));
 
         setPages();
+        isReady = true;
     }
 
     @Override
@@ -84,7 +95,7 @@ public abstract class PagerReader extends BaseReader {
         if (this.pages != pages) {
             this.pages = pages;
             this.currentPage = currentPage;
-            if (isResumed()) {
+            if (isReady) {
                 setPages();
             }
         }
@@ -110,6 +121,10 @@ public abstract class PagerReader extends BaseReader {
         return pager.onImageTouch(motionEvent);
     }
 
+    private void setImageScaleType(int scaleType) {
+        this.scaleType = scaleType;
+    }
+
     public abstract void onFirstPageOut();
     public abstract void onLastPageOut();
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderAdapter.java

@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.viewer.pager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
+import android.view.ViewGroup;
 
 import java.util.List;
 
@@ -23,7 +24,19 @@ public class PagerReaderAdapter extends FragmentStatePagerAdapter {
 
     @Override
     public Fragment getItem(int position) {
-        return PagerReaderFragment.newInstance(pages.get(position));
+        return PagerReaderFragment.newInstance();
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+        PagerReaderFragment f = (PagerReaderFragment) super.instantiateItem(container, position);
+        f.setPage(pages.get(position));
+        return f;
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        return POSITION_NONE;
     }
 
     public List<Page> getPages() {
@@ -35,9 +48,4 @@ public class PagerReaderAdapter extends FragmentStatePagerAdapter {
         notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemPosition(Object object) {
-        return POSITION_NONE;
-    }
-
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerReaderFragment.java

@@ -25,7 +25,7 @@ import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.source.model.Page;
 import eu.kanade.tachiyomi.ui.base.fragment.BaseFragment;
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity;
-import eu.kanade.tachiyomi.ui.reader.viewer.base.BaseReader;
+import eu.kanade.tachiyomi.ui.reader.viewer.pager.vertical.VerticalReader;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -41,13 +41,12 @@ public class PagerReaderFragment extends BaseFragment {
     @Bind(R.id.retry_button) Button retryButton;
 
     private Page page;
+    private boolean isReady;
     private Subscription progressSubscription;
     private Subscription statusSubscription;
 
-    public static PagerReaderFragment newInstance(Page page) {
+    public static PagerReaderFragment newInstance() {
-        PagerReaderFragment fragment = new PagerReaderFragment();
+        return new PagerReaderFragment();
-        fragment.setPage(page);
-        return fragment;
     }
 
     @Override
@@ -55,18 +54,20 @@ public class PagerReaderFragment extends BaseFragment {
         View view = inflater.inflate(R.layout.item_pager_reader, container, false);
         ButterKnife.bind(this, view);
         ReaderActivity activity = getReaderActivity();
-        BaseReader parentFragment = (BaseReader) getParentFragment();
+        PagerReader parentFragment = (PagerReader) getParentFragment();
 
         if (activity.getReaderTheme() == ReaderActivity.BLACK_THEME) {
              progressText.setTextColor(ContextCompat.getColor(getContext(), R.color.light_grey));
         }
 
         imageView.setParallelLoadingEnabled(true);
-        imageView.setMaxDimensions(activity.getMaxBitmapSize(), activity.getMaxBitmapSize());
+        imageView.setMaxBitmapDimensions(activity.getMaxBitmapSize());
         imageView.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_FIXED);
         imageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE);
-        imageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE);
+        imageView.setMinimumScaleType(parentFragment.scaleType);
         imageView.setRegionDecoderClass(parentFragment.getRegionDecoderClass());
+        imageView.setBitmapDecoderClass(parentFragment.getBitmapDecoderClass());
+        imageView.setVerticalScrollingParent(parentFragment instanceof VerticalReader);
         imageView.setOnTouchListener((v, motionEvent) -> parentFragment.onImageTouch(motionEvent));
         imageView.setOnImageEventListener(new SubsamplingScaleImageView.DefaultOnImageEventListener() {
             @Override
@@ -84,6 +85,7 @@ public class PagerReaderFragment extends BaseFragment {
         });
 
         observeStatus();
+        isReady = true;
         return view;
     }
 
@@ -97,6 +99,9 @@ public class PagerReaderFragment extends BaseFragment {
 
     public void setPage(Page page) {
         this.page = page;
+        if (isReady) {
+            observeStatus();
+        }
     }
 
     private void showImage() {
@@ -185,8 +190,8 @@ public class PagerReaderFragment extends BaseFragment {
 
         final AtomicInteger currentValue = new AtomicInteger(-1);
 
-        progressSubscription = Observable.interval(75, TimeUnit.MILLISECONDS, Schedulers.newThread())
+        progressSubscription = Observable.interval(100, TimeUnit.MILLISECONDS, Schedulers.newThread())
-                .onBackpressureDrop()
+                .onBackpressureLatest()
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(tick -> {
                     // Refresh UI only if progress change

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java

@@ -47,7 +47,7 @@ public class HorizontalPager extends ViewPager implements Pager {
 
             return super.onInterceptTouchEvent(ev);
         } catch (IllegalArgumentException e) {
-            return true;
+            return false;
         }
     }
 
@@ -82,7 +82,7 @@ public class HorizontalPager extends ViewPager implements Pager {
 
             return super.onTouchEvent(ev);
         } catch (IllegalArgumentException e) {
-            return true;
+            return false;
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java

@@ -32,7 +32,7 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager {
     }
 
     private void init(Context context) {
-        gestureDetector = new GestureDetector(context, new VerticalPagerGestureListener(this));
+        gestureDetector = new GestureDetector(context, new PagerGestureListener(this));
     }
 
     @Override
@@ -46,7 +46,7 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager {
 
             return super.onInterceptTouchEvent(ev);
         } catch (IllegalArgumentException e) {
-            return true;
+            return false;
         }
     }
 
@@ -81,7 +81,7 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager {
 
             return super.onTouchEvent(ev);
         } catch (IllegalArgumentException e) {
-            return true;
+            return false;
         }
     }
 
@@ -120,19 +120,4 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager {
         });
     }
     
-    private static class VerticalPagerGestureListener extends PagerGestureListener {
-
-        public VerticalPagerGestureListener(Pager pager) {
-            super(pager);
-        }
-
-        @Override
-        public boolean onDown(MotionEvent e) {
-            // Vertical view pager ignores scrolling events sometimes.
-            // Returning true here fixes it, but we lose touch events on the image like
-            // double tap to zoom
-            return true;
-        }
-    }
-    
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.source.model.Page;
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity;
 
 public class WebtoonAdapter extends RecyclerView.Adapter<WebtoonHolder> {
 
@@ -64,4 +65,8 @@ public class WebtoonAdapter extends RecyclerView.Adapter<WebtoonHolder> {
         return fragment;
     }
 
+    public ReaderActivity getReaderActivity() {
+        return (ReaderActivity) fragment.getActivity();
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonHolder.java

@@ -4,8 +4,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.ProgressBar;
 
@@ -24,7 +22,6 @@ public class WebtoonHolder extends RecyclerView.ViewHolder {
     @Bind(R.id.progress) ProgressBar progressBar;
     @Bind(R.id.retry_button) Button retryButton;
 
-    private Animation fadeInAnimation;
     private Page page;
     private WebtoonAdapter adapter;
 
@@ -33,20 +30,32 @@ public class WebtoonHolder extends RecyclerView.ViewHolder {
         this.adapter = adapter;
         ButterKnife.bind(this, view);
 
-        fadeInAnimation = AnimationUtils.loadAnimation(view.getContext(), R.anim.fade_in);
-
         imageView.setParallelLoadingEnabled(true);
+        imageView.setMaxBitmapDimensions(adapter.getReaderActivity().getMaxBitmapSize());
         imageView.setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_FIXED);
         imageView.setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE);
-        imageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE);
+        imageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH);
+        imageView.setMaxScale(10);
+        imageView.setRegionDecoderClass(adapter.getReader().getRegionDecoderClass());
+        imageView.setBitmapDecoderClass(adapter.getReader().getBitmapDecoderClass());
+        imageView.setVerticalScrollingParent(true);
         imageView.setOnTouchListener(touchListener);
         imageView.setOnImageEventListener(new SubsamplingScaleImageView.DefaultOnImageEventListener() {
             @Override
             public void onImageLoaded() {
-                imageView.startAnimation(fadeInAnimation);
+                // When the image is loaded, reset the minimum height to avoid gaps
+                container.setMinimumHeight(0);
             }
         });
-        progressBar.setMinimumHeight(view.getResources().getDisplayMetrics().heightPixels);
+
+        // Avoid to create a lot of view holders taking twice the screen height,
+        // saving memory and a possible OOM. When the first image is loaded in this holder,
+        // the minimum size will be removed.
+        // Doing this we get sequential holder instantiation.
+        container.setMinimumHeight(view.getResources().getDisplayMetrics().heightPixels * 2);
+
+        // Leave some space between progress bars
+        progressBar.setMinimumHeight(300);
 
         container.setOnTouchListener(touchListener);
         retryButton.setOnTouchListener((v, event) -> {
@@ -90,7 +99,6 @@ public class WebtoonHolder extends RecyclerView.ViewHolder {
         setErrorButtonVisible(false);
         setProgressVisible(false);
         setImageVisible(true);
-        imageView.setRegionDecoderClass(adapter.getReader().getRegionDecoderClass());
         imageView.setImage(ImageSource.uri(page.getImagePath()));
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonReader.java

@@ -1,7 +1,6 @@
 package eu.kanade.tachiyomi.ui.reader.viewer.webtoon;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
@@ -30,12 +29,26 @@ public class WebtoonReader extends BaseReader {
     private Subscription decoderSubscription;
     private GestureDetector gestureDetector;
 
-    @Nullable
+    private boolean isReady;
+    private int scrollDistance;
+
+    private static final String SCROLL_STATE = "scroll_state";
+
+    private static final float LEFT_REGION = 0.33f;
+    private static final float RIGHT_REGION = 0.66f;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
         adapter = new WebtoonAdapter(this);
+
+        int screenHeight = getResources().getDisplayMetrics().heightPixels;
+        scrollDistance = screenHeight * 3 / 4;
+
         layoutManager = new PreCachingLayoutManager(getActivity());
-        layoutManager.setExtraLayoutSpace(getResources().getDisplayMetrics().heightPixels);
+        layoutManager.setExtraLayoutSpace(screenHeight / 2);
+        if (savedState != null) {
+            layoutManager.onRestoreInstanceState(savedState.getParcelable(SCROLL_STATE));
+        }
 
         recycler = new RecyclerView(getActivity());
         recycler.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
@@ -45,28 +58,29 @@ public class WebtoonReader extends BaseReader {
 
         decoderSubscription = getReaderActivity().getPreferences().imageDecoder()
                 .asObservable()
-                .doOnNext(this::setRegionDecoderClass)
+                .doOnNext(this::setDecoderClass)
                 .skip(1)
                 .distinctUntilChanged()
-                .subscribe(v -> adapter.notifyDataSetChanged());
+                .subscribe(v -> recycler.setAdapter(adapter));
 
-        gestureDetector = new GestureDetector(getActivity(), new SimpleOnGestureListener() {
+        gestureDetector = new GestureDetector(recycler.getContext(), new SimpleOnGestureListener() {
             @Override
             public boolean onSingleTapConfirmed(MotionEvent e) {
+                final float positionX = e.getX();
+
+                if (positionX < recycler.getWidth() * LEFT_REGION) {
+                    recycler.smoothScrollBy(0, -scrollDistance);
+                } else if (positionX > recycler.getWidth() * RIGHT_REGION) {
+                    recycler.smoothScrollBy(0, scrollDistance);
+                } else {
                     getReaderActivity().onCenterSingleTap();
+                }
                 return true;
             }
-
-            @Override
-            public boolean onDown(MotionEvent e) {
-                // The only way I've found to allow panning. Double tap event (zoom) is lost
-                // but panning should be the most used one
-                return true;
-            }
-
         });
 
         setPages();
+        isReady = true;
 
         return recycler;
     }
@@ -83,6 +97,12 @@ public class WebtoonReader extends BaseReader {
         super.onPause();
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(SCROLL_STATE, layoutManager.onSaveInstanceState());
+    }
+
     private void unsubscribeStatus() {
         if (subscription != null && !subscription.isUnsubscribed())
             subscription.unsubscribe();
@@ -97,7 +117,9 @@ public class WebtoonReader extends BaseReader {
     public void onPageListReady(List<Page> pages, int currentPage) {
         if (this.pages != pages) {
             this.pages = pages;
-            if (isResumed()) {
+            // Restoring current page is not supported. It's getting weird scrolling jumps
+            // this.currentPage = currentPage;
+            if (isReady) {
                 setPages();
             }
         }
@@ -109,6 +131,7 @@ public class WebtoonReader extends BaseReader {
             recycler.clearOnScrollListeners();
             adapter.setPages(pages);
             recycler.setAdapter(adapter);
+            updatePageNumber();
             setScrollListener();
             observeStatus(0);
         }

app/src/main/java/eu/kanade/tachiyomi/ui/recent/RecentChaptersAdapter.java

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.ui.recent;
 
 import android.support.v7.widget.RecyclerView;
-import android.text.format.DateFormat;
+import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +10,8 @@ import android.widget.TextView;
 import java.util.Date;
 import java.util.List;
 
+import butterknife.Bind;
+import butterknife.ButterKnife;
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.kanade.tachiyomi.R;
 import eu.kanade.tachiyomi.data.database.models.MangaChapter;
@@ -18,8 +20,8 @@ public class RecentChaptersAdapter extends FlexibleAdapter<RecyclerView.ViewHold
 
     private RecentChaptersFragment fragment;
 
-    private static final int CHAPTER = 0;
+    private static final int VIEW_TYPE_CHAPTER = 0;
-    private static final int SECTION = 1;
+    private static final int VIEW_TYPE_SECTION = 1;
 
     public RecentChaptersAdapter(RecentChaptersFragment fragment) {
         this.fragment = fragment;
@@ -47,7 +49,7 @@ public class RecentChaptersAdapter extends FlexibleAdapter<RecyclerView.ViewHold
 
     @Override
     public int getItemViewType(int position) {
-        return getItem(position) instanceof MangaChapter ? CHAPTER : SECTION;
+        return getItem(position) instanceof MangaChapter ? VIEW_TYPE_CHAPTER : VIEW_TYPE_SECTION;
     }
 
     @Override
@@ -55,10 +57,10 @@ public class RecentChaptersAdapter extends FlexibleAdapter<RecyclerView.ViewHold
         LayoutInflater inflater = LayoutInflater.from(parent.getContext());
         View v;
         switch (viewType) {
-            case CHAPTER:
+            case VIEW_TYPE_CHAPTER:
                 v = inflater.inflate(R.layout.item_recent_chapter, parent, false);
                 return new RecentChaptersHolder(v, this, fragment);
-            case SECTION:
+            case VIEW_TYPE_SECTION:
                 v = inflater.inflate(R.layout.item_recent_chapter_section, parent, false);
                 return new SectionViewHolder(v);
         }
@@ -68,11 +70,11 @@ public class RecentChaptersAdapter extends FlexibleAdapter<RecyclerView.ViewHold
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         switch (holder.getItemViewType()) {
-            case CHAPTER:
+            case VIEW_TYPE_CHAPTER:
                 final MangaChapter chapter = (MangaChapter) getItem(position);
                 ((RecentChaptersHolder) holder).onSetValues(chapter);
                 break;
-            case SECTION:
+            case VIEW_TYPE_SECTION:
                 final Date date = (Date) getItem(position);
                 ((SectionViewHolder) holder).onSetValues(date);
                 break;
@@ -86,18 +88,21 @@ public class RecentChaptersAdapter extends FlexibleAdapter<RecyclerView.ViewHold
         return fragment;
     }
 
-    private static class SectionViewHolder extends RecyclerView.ViewHolder {
+    public static class SectionViewHolder extends RecyclerView.ViewHolder {
 
-        private TextView view;
+        @Bind(R.id.section_text) TextView section;
+
+        private final long now = new Date().getTime();
 
         public SectionViewHolder(View view) {
             super(view);
-            this.view = (TextView) view;
+            ButterKnife.bind(this, view);
         }
 
         public void onSetValues(Date date) {
-            String s = DateFormat.getDateFormat(view.getContext()).format(date);
+            CharSequence s = DateUtils.getRelativeTimeSpanString(
-            view.setText(s);
+                    date.getTime(), now, DateUtils.DAY_IN_MILLIS);
+            section.setText(s);
         }
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/recent/RecentChaptersPresenter.java

@@ -42,7 +42,11 @@ public class RecentChaptersPresenter extends BasePresenter<RecentChaptersFragmen
     }
 
     private Observable<List<Object>> getRecentChaptersObservable() {
-        return db.getRecentChapters().asRxObservable()
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        cal.add(Calendar.MONTH, -1);
+
+        return db.getRecentChapters(cal.getTime()).asRxObservable()
                 // group chapters by the date they were fetched on a ordered map
                 .flatMap(recents -> Observable.from(recents)
                         .toMultimap(

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.java

@@ -71,7 +71,7 @@ public class SettingsAdvancedFragment extends SettingsNestedFragment {
 
         subscriptions.add(Observable.defer(() -> Observable.from(files))
                 .concatMap(file -> {
-                    if (chapterCache.remove(file.getName())) {
+                    if (chapterCache.removeFileFromCache(file.getName())) {
                         deletedFiles.incrementAndGet();
                     }
                     return Observable.just(file);

app/src/main/java/eu/kanade/tachiyomi/util/RxPager.java

@@ -1,32 +1,26 @@
 package eu.kanade.tachiyomi.util;
 
+import android.util.Pair;
+
+import java.util.List;
+
 import rx.Observable;
+import rx.functions.Func1;
 import rx.subjects.PublishSubject;
 
-public class RxPager {
+public class RxPager<T> {
 
-    private final int initialPageCount;
+    private final PublishSubject<List<T>> results = PublishSubject.create();
-    private final PublishSubject<Integer> requests = PublishSubject.create();
     private int requestedCount;
 
-    public RxPager() {
+    public Observable<Pair<Integer, List<T>>> results() {
-        this(1);
+        requestedCount = 0;
+        return results.map(list -> Pair.create(requestedCount++, list));
     }
 
-    public RxPager(int initialPageCount) {
+    public Observable<List<T>> request(Func1<Integer, Observable<List<T>>> networkObservable) {
-        this.initialPageCount = initialPageCount;
+        return networkObservable.call(requestedCount).doOnNext(results::onNext);
     }
 
-    public void requestNext(int page) {
-        requests.onNext(page);
 }
 
-    public Observable<Integer> pages() {
-        return requests
-            .concatMap(targetPage -> targetPage <= requestedCount ?
-                    Observable.<Integer>empty() :
-                    Observable.range(requestedCount, targetPage - requestedCount))
-            .startWith(Observable.range(0, initialPageCount))
-            .doOnNext(it -> requestedCount = it + 1);
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/util/UrlUtil.java

@@ -5,6 +5,10 @@ import java.net.URISyntaxException;
 
 public class UrlUtil {
 
+    private static final String JPG = ".jpg";
+    private static final String PNG = ".png";
+    private static final String GIF = ".gif";
+
     public static String getPath(String s) {
         try {
             URI uri = new URI(s);
@@ -18,4 +22,37 @@ public class UrlUtil {
             return s;
         }
     }
+
+    public static boolean isJpg(String url) {
+        return containsIgnoreCase(url, JPG);
+    }
+
+    public static boolean isPng(String url) {
+        return containsIgnoreCase(url, PNG);
+    }
+
+    public static boolean isGif(String url) {
+        return containsIgnoreCase(url, GIF);
+    }
+
+    public static boolean containsIgnoreCase(String src, String what) {
+        final int length = what.length();
+        if (length == 0)
+            return true; // Empty string is contained
+
+        final char firstLo = Character.toLowerCase(what.charAt(0));
+        final char firstUp = Character.toUpperCase(what.charAt(0));
+
+        for (int i = src.length() - length; i >= 0; i--) {
+            // Quick check before calling the more expensive regionMatches() method:
+            final char ch = src.charAt(i);
+            if (ch != firstLo && ch != firstUp)
+                continue;
+
+            if (src.regionMatches(true, i, what, 0, length))
+                return true;
+        }
+
+        return false;
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/widget/EndlessGridScrollListener.java

@@ -5,7 +5,7 @@ import android.support.v7.widget.RecyclerView;
 
 import rx.functions.Action0;
 
-public class EndlessRecyclerScrollListener extends RecyclerView.OnScrollListener {
+public class EndlessGridScrollListener extends RecyclerView.OnScrollListener {
 
     private int previousTotal = 0; // The total number of items in the dataset after the last load
     private boolean loading = true; // True if we are still waiting for the last set of data to load.
@@ -16,7 +16,7 @@ public class EndlessRecyclerScrollListener extends RecyclerView.OnScrollListener
 
     private Action0 requestNext;
 
-    public EndlessRecyclerScrollListener(GridLayoutManager layoutManager, Action0 requestNext) {
+    public EndlessGridScrollListener(GridLayoutManager layoutManager, Action0 requestNext) {
         this.layoutManager = layoutManager;
         this.requestNext = requestNext;
     }

app/src/main/java/eu/kanade/tachiyomi/widget/EndlessListScrollListener.java

@@ -0,0 +1,49 @@
+package eu.kanade.tachiyomi.widget;
+
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import rx.functions.Action0;
+
+public class EndlessListScrollListener extends RecyclerView.OnScrollListener {
+
+    private int previousTotal = 0; // The total number of items in the dataset after the last load
+    private boolean loading = true; // True if we are still waiting for the last set of data to load.
+    private int visibleThreshold = 5; // The minimum amount of items to have below your current scroll position before loading more.
+    int firstVisibleItem, visibleItemCount, totalItemCount;
+
+    private LinearLayoutManager layoutManager;
+
+    private Action0 requestNext;
+
+    public EndlessListScrollListener(LinearLayoutManager layoutManager, Action0 requestNext) {
+        this.layoutManager = layoutManager;
+        this.requestNext = requestNext;
+    }
+
+    public void resetScroll() {
+        previousTotal = 0;
+        loading = true;
+    }
+
+    @Override
+    public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+        super.onScrolled(recyclerView, dx, dy);
+
+        visibleItemCount = recyclerView.getChildCount();
+        totalItemCount = layoutManager.getItemCount();
+        firstVisibleItem = layoutManager.findFirstVisibleItemPosition();
+
+        if (loading && (totalItemCount > previousTotal)) {
+            loading = false;
+            previousTotal = totalItemCount;
+        }
+        if (!loading && (totalItemCount - visibleItemCount)
+                <= (firstVisibleItem + visibleThreshold)) {
+            // End has been reached
+            requestNext.call();
+            loading = true;
+        }
+    }
+
+}

app/src/main/res/drawable/gradient_shape.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:startColor="#aa000000"
+        android:centerColor="#00000000"
+        android:endColor="#00ffffff"/>
+
+    <corners android:radius="0dp" />
+</shape>

app/src/main/res/layout/activity_edit_categories.xml

@@ -23,6 +23,7 @@
         android:layout_gravity="bottom|right"
         android:layout_margin="@dimen/fab_margin"
         android:src="@drawable/ic_action_add_18dp"
+        app:backgroundTint="@color/colorPrimary"
         app:layout_anchor="@id/categories_list"
         app:layout_anchorGravity="bottom|right|end"
         app:layout_behavior="eu.kanade.tachiyomi.ui.base.fab.ScrollAwareFABBehavior"/>

app/src/main/res/layout/fragment_catalogue.xml

@@ -11,17 +11,28 @@
         android:id="@+id/progress"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical|center_horizontal"
         android:visibility="gone"/>
 
-    <eu.kanade.tachiyomi.widget.AutofitRecyclerView
+    <ViewSwitcher
-        android:id="@+id/recycler"
+        android:layout_width="match_parent"
-        style="@style/AppTheme.GridView"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:id="@+id/switcher">
+
+        <eu.kanade.tachiyomi.widget.AutofitRecyclerView
+            android:id="@+id/catalogue_grid"
+            style="@style/AppTheme.GridView"
             android:columnWidth="140dp"
-        tools:listitem="@layout/item_catalogue" />
+            tools:listitem="@layout/item_catalogue_grid" />
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/catalogue_list"/>
+
+    </ViewSwitcher>
 
     <ProgressBar
         android:id="@+id/progress_grid"

app/src/main/res/layout/fragment_library_category.xml

@@ -8,6 +8,6 @@
         android:id="@+id/library_mangas"
         style="@style/AppTheme.GridView"
         android:columnWidth="140dp"
-        tools:listitem="@layout/item_catalogue" />
+        tools:listitem="@layout/item_catalogue_grid" />
 
 </FrameLayout>

app/src/main/res/layout/fragment_manga_info.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -16,8 +17,8 @@
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh"
         android:layout_width="match_parent"
-        android:orientation="vertical"
+        android:layout_height="match_parent"
-        android:layout_height="match_parent">
+        android:orientation="vertical">
 
         <ScrollView
             android:layout_width="match_parent"
@@ -154,7 +155,31 @@
                             android:layout_width="fill_parent"
                             android:layout_height="wrap_content"
                             android:layout_alignBaseline="@id/manga_status_label"
-                            android:layout_toRightOf="@id/manga_chapters_label"
+                            android:layout_toRightOf="@id/manga_status_label"
+                            android:ellipsize="end"
+                            android:focusable="false"
+                            android:focusableInTouchMode="false"
+                            android:maxLines="1"
+                            android:singleLine="true"/>
+
+                        <TextView
+                            android:id="@+id/manga_source_label"
+                            style="@style/manga_detail_label"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_below="@id/manga_status_label"
+                            android:focusable="false"
+                            android:focusableInTouchMode="false"
+                            android:text="@string/source"/>
+
+                        <TextView
+                            android:id="@+id/manga_source"
+                            style="@style/manga_detail_text"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_alignBaseline="@id/manga_source_label"
+                            android:layout_toRightOf="@id/manga_source_label"
                             android:ellipsize="end"
                             android:focusable="false"
                             android:focusableInTouchMode="false"
@@ -167,7 +192,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentLeft="true"
-                            android:layout_below="@id/manga_status_label"
+                            android:layout_below="@id/manga_source_label"
                             android:focusable="false"
                             android:focusableInTouchMode="false"
                             android:text="@string/genres"/>
@@ -228,10 +253,29 @@
 
                 </LinearLayout>
 
+
             </LinearLayout>
 
         </ScrollView>
 
     </android.support.v4.widget.SwipeRefreshLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="10dp"
+        android:gravity="bottom">
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|right"
+            android:layout_margin="@dimen/fab_margin"
+            app:backgroundTint="@color/colorPrimary"
+            app:layout_behavior="eu.kanade.tachiyomi.ui.base.fab.ScrollAwareFABBehavior"/>
+
     </LinearLayout>
+</RelativeLayout>

app/src/main/res/layout/item_catalogue_grid.xml

@@ -12,14 +12,28 @@
         android:layout_height="wrap_content"
         android:background="@drawable/card_background">
 
+        <android.support.percent.PercentFrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="220dp"
+            android:id="@+id/image_container">
+
             <ImageView
                 android:id="@+id/thumbnail"
                 android:layout_width="match_parent"
-            android:layout_height="220dp"
+                android:layout_height="match_parent"
                 android:background="@color/white"
                 tools:background="@color/md_red_100"
                 tools:src="@mipmap/ic_launcher"/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_heightPercent="50%"
+                android:layout_gravity="bottom"
+                android:background="@drawable/gradient_shape"/>
+
+        </android.support.percent.PercentFrameLayout>
+
         <TextView
             android:id="@+id/unreadText"
             android:layout_width="wrap_content"
@@ -38,20 +52,14 @@
             android:id="@+id/favorite_sticker"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignEnd="@+id/thumbnail"
+            android:layout_alignEnd="@+id/image_container"
-            android:layout_alignRight="@+id/thumbnail"
+            android:layout_alignRight="@+id/image_container"
-            android:layout_alignTop="@+id/thumbnail"
+            android:layout_alignTop="@+id/image_container"
             android:layout_marginRight="5dp"
             android:layout_marginTop="5dp"
             android:src="@drawable/ic_action_favorite_blue"
             android:visibility="invisible"/>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/thumbnail"
-            android:background="@color/manga_cover_title_background">
-
         <eu.kanade.tachiyomi.widget.PTSansTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
@@ -68,10 +76,9 @@
             android:shadowDy="0"
             android:shadowColor="@color/primary_text"
             android:shadowRadius="4"
+            android:layout_alignBottom="@+id/image_container"
             tools:text="Sample name"/>
 
-        </FrameLayout>
-
     </RelativeLayout>
 
 </FrameLayout>

app/src/main/res/layout/item_catalogue_list.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:listPreferredItemHeightSmall"
+    android:background="@drawable/selector_chapter_light">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:paddingLeft="?android:listPreferredItemPaddingLeft"
+        android:paddingRight="?android:listPreferredItemPaddingLeft"
+        android:id="@+id/title"/>
+
+</FrameLayout>

app/src/main/res/layout/item_chapter.xml

@@ -66,7 +66,7 @@
             android:layout_alignParentTop="true"
             android:layout_alignWithParentIfMissing="true"
             android:layout_marginRight="30dp"
-            android:ellipsize="end"
+            android:ellipsize="middle"
             android:gravity="center_vertical"
             android:maxLines="1"
             android:textSize="17sp"

app/src/main/res/layout/item_pager_reader.xml

@@ -30,6 +30,8 @@
 
     </LinearLayout>
 
+    <include layout="@layout/chapter_image"/>
+
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -38,6 +40,4 @@
         android:layout_gravity="center"
         android:visibility="gone"/>
 
-    <include layout="@layout/chapter_image"/>
-
 </FrameLayout>

app/src/main/res/layout/item_recent_chapter_section.xml

@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-          android:layout_height="48dp"
+    android:layout_height="32dp"
     android:gravity="center_vertical"
-          android:paddingLeft="24dp"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:background="@color/colorPrimary">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:singleLine="true"
-          android:textAllCaps="true"
+        android:textColor="@color/white"
-          android:textColor="@color/colorAccent"
-          android:background="@android:color/transparent"
         android:textSize="16sp"
         android:id="@+id/section_text"
+        android:layout_gravity="center_vertical"
         android:textStyle="bold" />
+
+</FrameLayout>
+
+

app/src/main/res/layout/item_webtoon_reader.xml

@@ -6,7 +6,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="300dp"
+        android:layout_height="match_parent"
         android:id="@+id/frame_container">
 
         <ProgressBar

app/src/main/res/layout/library_tab_layout.xml

@@ -8,7 +8,6 @@
     android:theme="@style/AppTheme.Overlay.Dark"
     android:background="@color/colorPrimary"
     android:visibility="gone"
-    app:elevation="4dp"
     app:tabGravity="center"
     app:tabMode="scrollable"
     app:tabMinWidth="75dp"

app/src/main/res/layout/reader_brightness.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:background="@color/reader_menu_background"
-    android:paddingRight="10dp"
-    android:paddingLeft="5dp"
-    android:paddingTop="5dp"
-    android:paddingBottom="5dp">
-
-    <CheckBox
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/reader_menu_settings_item"
-        android:text="@string/pref_custom_brightness"
-        android:id="@+id/custom_brightness" />
-
-    <SeekBar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/brightness_seekbar" />
-</LinearLayout>

app/src/main/res/layout/reader_menu.xml

@@ -74,18 +74,19 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:id="@+id/reader_brightness"
+                android:id="@+id/lock_orientation"
-                android:src="@drawable/ic_brightness_high"
+                android:src="@drawable/ic_screen_rotation"
                 android:layout_gravity="center_vertical"
                 android:background="?android:selectableItemBackground" />
             <ImageButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:id="@+id/lock_orientation"
+                android:id="@+id/reader_scale_type_selector"
-                android:src="@drawable/ic_screen_rotation"
+                android:src="@drawable/ic_zoom_out_map_white_24dp"
                 android:layout_gravity="center_vertical"
                 android:background="?android:selectableItemBackground" />
+
             <ImageButton
                 android:layout_width="0dp"
                 android:layout_height="match_parent"

app/src/main/res/layout/reader_popup.xml

@@ -10,7 +10,8 @@
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:id="@+id/image_decoder_container">
 
         <TextView
             android:id="@+id/image_decoder_initial"
@@ -53,4 +54,16 @@
         style="@style/reader_menu_settings_item"
         android:text="@string/pref_keep_screen_on"/>
 
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/reader_menu_settings_item"
+        android:text="@string/pref_custom_brightness"
+        android:id="@+id/custom_brightness" />
+
+    <SeekBar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/brightness_seekbar" />
+
 </LinearLayout>

app/src/main/res/layout/tab_layout.xml

@@ -8,5 +8,4 @@
     android:theme="@style/AppTheme.Overlay.Dark"
     app:tabGravity="fill"
     android:background="@color/colorPrimary"
-    app:elevation="4dp"
     app:tabIndicatorColor="@color/white"/>

app/src/main/res/layout/toolbar.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
     android:background="@color/colorPrimary"
-    app:elevation="4dp"
+    android:theme="@style/AppTheme.ActionBar"/>
-    android:theme="@style/AppTheme.ActionBar"
-    app:layout_scrollFlags="scroll|enterAlways|snap"/>

app/src/main/res/menu/catalogue_list.xml

@@ -1,11 +1,16 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context=".CatalogueListActivity">
+
     <item
         android:id="@+id/action_search"
         android:title="@string/action_search"
         android:icon="@drawable/ic_action_search"
-        android:orderInCategory="100"
         app:showAsAction="collapseActionView|ifRoom"
         app:actionViewClass="android.support.v7.widget.SearchView"/>
+
+    <item
+        android:id="@+id/action_display_mode"
+        android:title="@string/action_display_mode"
+        app:showAsAction="ifRoom"/>
 </menu>