Release 0.6.6

* Fix automatic backups

* Small fixes

* small fixes

.travis.yml

@@ -1,41 +1,57 @@
 language: android
 android:
   components:
-    - platform-tools
+  - build-tools-27.0.1
-    - tools
+  - android-26
-
+  - extra-android-m2repository
-    # The BuildTools version used by your project
+  - extra-google-m2repository
-    - build-tools-25.0.1
+  - extra-android-support
-    - android-25
+  - extra-google-google_play_services
-    - extra-android-m2repository
-    - extra-google-m2repository
-    - extra-android-support
-    - extra-google-google_play_services
-
   licenses:
-    - android-sdk-license-.+
+  - android-sdk-license-.+
-    - '.+'
-
-jdk:
-  - oraclejdk8
-
-before_script:
-  - chmod +x gradlew
-
 before_install:
-  - mkdir "$ANDROID_HOME/licenses" || true
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+    openssl aes-256-cbc -K $encrypted_e56be693d4fd_key -iv $encrypted_e56be693d4fd_iv -in "$PWD/.travis/secrets.tar.enc" -out secrets.tar -d;
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+    tar xf secrets.tar;
-
+    mv debug.keystore "$HOME/.android";
-#Build, and run tests
+  fi
-script: "./gradlew clean buildStandardDebug"
+- git clone https://github.com/urho3d/android-ndk.git $HOME/android-ndk-root
-sudo: false
+- export ANDROID_NDK_HOME=$HOME/android-ndk-root
-
+- mkdir "$ANDROID_HOME/licenses" || true
+- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+script: ".travis/build.sh"
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
-    - $HOME/.gradle/caches/
+  - "$HOME/.gradle/caches/"
-    - $HOME/.gradle/wrapper/
+  - "$HOME/.gradle/wrapper/"
+  - "$HOME/.android/build-cache"
+deploy:
+- provider: releases
+  api_key:
+    secure: qmS9SyMq8xPDqaY83rvAFyZcvic24lGBj3MFt22RhVJzIXAAN/vqL1R70PnNiCF7CE+R7PaDlBpwjxDMBiuh0QQNc1oX6cgepUbro4/Nt7NFFfCvKXaFdR1cSgYouhuHmy0SS0/alrcfhQ2bPwcm1/vAOiSa8Wu7hsXhCcxbFyEbXZVD11QZmiffEM0py+OeuqOFo2JxZaGRu2z04E/u5TWep1ZEuhFRCC87PGgFqABgg6jYYebQOUZADG/0G8581HTGU0mdwueYsiA35ncRzpV2V8DajEEBd5wOe5d8SyMtE+6Qs5PD9KcXAqGGe4QRmrJMX5EcLQaLZf/Qd5s9SFZVHb1aJIw/y05w4L5dlVpsjx5WuUAYAVg7Ol5UawofFo/hYkYCNmfub67wJQdHSIxPif7V6YeON6RQQMpc5GBYY9eA6ZxhrdA2m7eyoOT3jcbdaVJwC0jMGhn26hkgJfTo1LfAUs85Cs3BrK8w6Poqc/Jb+4Y0NhdGIKgO5tS3vY54cTJVVrQTq4/XmME4ZnzOX3HaOqzfyt/6M4gEQMvaeFksxwoFhocV7wfaCq9ps/Kdq2dl4KwoqRV2WqVaauqzCP4XPSlVLaJqztsw0wboupcaZepWJ2a/6j9IrKo1pEnyeHF5y+k0SUAxL0X8iKZ0uPxsgoVrlNtqXJWNGvA=
+  file: tachiyomi-v*.apk
+  file_glob: true
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: inorichi/tachiyomi
+- provider: script
+  script: ".travis/deploy.sh"
+  skip_cleanup: true
+  on:
+    branch: master
+    condition: "-z $TRAVIS_TAG"
+    repo: inorichi/tachiyomi
 env:
-  - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
+  global:
+  - secure: Ita1+tzo7P5IC2yqU3KgRcXt+5DTpP0103Hx/ECYi42/7rLt+TC7PMjl2yH3Z189+tGwLq0Ol1KJ2Z5Rn3q7EaQgD0+WRkH/ijtrjKoVh7dyItIBp7yowZpA0TJHQ4EZpGSxZakKbIP4di8XMxJ2+5VzEivYUt04LCUpzugemL6b6XOfUmOZykVxV2UDAlPPggklITYBXkHUa0mwJhjS1aPPeeR3PhVXomkqfuOJOKejPXXXJope9fhAnmopHA7ISfjIrTuwDVQJqNSuco+O9kQShmlu0C8pob1vFGPEDvafaDS8SZ9A6gKT1ZfgSUqVmvDbx0WLX8XugBLrQedtZv63esOa1WUyGhgFVpeJjexlszXlhyfP1gH5QbzRr+EiSaagCyjf9II2veLAtU5cFY+nj6KBdKQsazIMRHf8SAQlWASyJYMED/N9RnUFxSf1rnLGqiY2ezjycx4ieFj7vhlbTgyao1GHjjR9cwNuntdMYWhY8+Vc7Fctmzm46xOyyz9oJGdyim76Y4w4MZvQNKeZOBAjdEgX6cXBk15scoM2Vj9ENox+MKZLaKRawXg2U1ujK+bWAQkXiVvPriv05/JtYsNUft8qAsm+69vtohDsUW7Wu0bBIKDL+v0W30ty1PpyNehBB2OquUE7fp53gitOmYl7TyuxktkMY8PXKKU=
+  - secure: NABCfigMUVM/9TLALYBpQLp/p3rG6MbH5y34/oqCSej/oh2u0nyhFSi8veS0lFpDIcv0TZvxHJXoSA0zeZijb1fUU8jYVNT2azuPWE6Gu7sf0TfBeCvulqbgLMoaA6JuWbEbZwHcxpKHg4vLSMjNk+ZP4v2dffI6A620fxLltxxhTpsYkYYsfKG857CpQtdgN/HqcOaxyvzXFmWWyVWHala1uMcMeXZCwgnlVAqau9o0bsU092txSmHqoesHoAinidSCTCmTlEqp/1AFaYQTbxmnfNC1yLgzxWAlJcS3NWzNo3ellMvKjsiIGn3JJpAjTGcyf3yPsvhs1cY3MZbmJYVyKH5HbnkA5ms6mx0DDJ2UOs5H2dmED82m14+hu62Xb8XN8zAdq+bySNSwgsGzvr1PT74pT4BW1T+D7L1xvUe6k1enZ38GIMJbJPhBybRQazhjKPmXRB30Thxoqe5VqU8UeiXHAEps7JYAWUR1PLZvEYQb6MWurmTxs9be/OTwrUT1LDiqeJZg6XkDGgQwuR2YBaQJHJD17Piq6q1BUX8abhK6wzAAYVqyGvpmUCmQCtHZgenE6ulwcKChzBv4n97OjE21LGWnbNF5ViUhfAbGcKOVufd1chZsfbkJ7a3tHYCfLnxHUIhKvHk26f5Em8h68D0wQkPnkcVVkfh7XpI=
+  - secure: C93UADV5aR0zhLCLwR6tCyz+fwUYslZbhjBl3PHQp+0boIGS/Be2UQTFHp/NB9mQmhWqbwqHoAVFENZFytV04ePgOuNtMFcjAIfnzm19Am7iRAMFixD45pF/CuYYfLupElkAcSequtAzN0g4G0sQ5KR1hibaDIoz9kfA2YcUAMaZ4T5bhCr8os/xA2nOlmvPDWsRWCFBYkSpnmbsSsgYAhulA/V5bSNAWnp9LPw3CBLibW3WsVP4wuhZAkXznKwn/mHT31kfQlpMH3qNhXpsN9huUkZ/k8QWeakcHJKugung0Z2T1StK8rlI8OrJstVcwueHTa2ses4f5VbhWog/Z8HDkdll9W9RM/QqXjNDtOVBt/SPuhCp4k2rvJixFUxzvSqgSWQvQnbHwjWxIUVVyHtnb0/zc/S9ONZG14TOwB/+Lkgacb85PNszurZ2f3mH0O6slIh1mH+5d9J4+L976ot4nTPlK1OtothagVyKGOrn9HycrPk/MjftIJuElHzo7NEJd/wRPqIb5y12iZN1RSPriU+itg1uSAVP891/o3peJyuqY9WSB7dYwgDJos6dDvbr19emtdyxkQR+eAb5duyH6s4R58wh1kJ1d4zu0X6uSnF4AIc+6teKkN24rSXcqB/hrcojS49jgLy5P0/CVsUbYZPI/tx8E/IJfr8m36E=
+  - secure: mawwBvllvESc/mp+JHvncq1iUhiC7nyokPgXmOehffc0K3byMLs2L25HjNsU6EnXG9Lcae1cfP8S9bWLquU2C3kpAkLBUpjEbdx7K0654uvs7Rrvb5hcTRHwjzaEVmVaBFX4ROcjUhBYny/Wjj/YENCkSWpkfcMd1esFbVsO+fOLyaAPvrb6auKY7H+pUSqlEwaEnrkYeBBZIHa7KqwL4g5DHbq6K368tjmval/wBzwMB0V8V3dt/ik8RMVDtKPrik4Bu0V9UmXZUIo/a06ii/CM82ekFRh3eUb0DKkdkmYbdH6MBMoLTfQtMa6A4luXaA0oycAnTX3OGB5MWIjK39KhWRavh6ybSIt4aHKoolxzH8Zgmk7xMhFSot/laX5q5IzjZu5KU6F2SmdV0kcQugM8oAjANFySetPvY1q7nZ8pM+NO1xKS/mH0w4vChhdJFD1mw7aCoh8FdeUf0Eym2+pp5Q9uAisWMmNn5XN8/fL5q6PzAxkXmkedfrr1N61FmIL6EKx8qiWpOUNlRRTIMJ4GMhCyckCF6cNxDkBItp52c+Hmkbn+ZEInEyX6gpjYVm3xyEi0Z5kLCi/fMX2nBNczc5BuGLzzmJnITv4ovpeYn2/vPvHbaPgPC4LqDK3AjlpVadMZk/M5Egn+hWY7Mni57CmpZD+SpxUbbsItI0c=
+  - secure: PJPDkUg1zc57brxUvNpSh+Q3ZEaGpBqZzwDavqslkn0WmjBTLrE6/OG7TFHKNmO+P56qFl+pMEKqThxqR3+4bWEeEx8ykkixDVzxNJMmws+7A7ImJ75iQyB6giMW/4tykVMMHgIPNAdcnI8VOWn0LGHnpFWUd70yoyAGX8s6cspHCKgcuWMA3GS410KJfHpyd0B9/QS7ZyWzSETW7zSPyLPa81SBO95EhOF3TOGZYLt/mBhdtU3YGFs4k9fZ8jDDcm9XmBfqVlUhb8HiZcxJiZDdRvxODERfNnwc47uaJk6+kxGDzIW2uAxrMXXVKkG04GeMOokXoR9kW1Hl2JmoyySLKLZmB7I/XEtVWdzZw16mWi+4zmhjLhfB0phSW+/5I+0VtZZ6jO031J5FL/JqVrcq1ws/aw4QlaOdPUco/x2u4LNHyYYgOi5arD9xSyu6IRy0jCC4Xa1zuqM5adGJX+rZyVfKZ0TxOW661HTxlo8COtkB2i0WR2deZGVN75ooCAEO8DauQoUcFH1OelahmPtzVs1/6ZczuxGdp9ED7ZQq9NHEOsOdUGCj/D79Dm1hWFQsIsslnnGYWitAycNCgEwmlt2Q6fbrv2CJrmLqZ9a9r3AhzxoHn9Qx1GyuyfhZJzm/6Ff2kcOjma2kcz13KUwTxdW+2G5dDCotK3f7aiI=
+  - secure: FIIZfEEYfjNMKODs33Czh603CYVn6LRrzpFNIiPHYTb8iQWv9qAYhsg4FpHfOjDikokTwb5X/h8G7AX93Z0xKyyDi75ACT11oPeTNTArDdcmdDVlOYBvYHc2Ci7pMW5r8LGejB7Y3mWM8uKyA3oKvneEFutB65vO3JVZvFWrm03Lmqqe7+mA4qNqNqTbN7R7fmk5b7zt7A3DHvDu0JPTbSSUwpso/p2I5WJYjrf71I7YMQwIFLoMfplC1onVA3EFS3lZsF65zE+xVRy34AKa41iZAMbhVDyqUHEnx6L0dwEdn2Z5XLlK0ov1+qLTLlQsBE4Knre6TNkWMfktk7MKA+ch8RYxvEYLODhQkIrOkLSNWhZPhdaT+xD4fr0RCKSHo6uWRC4aofsJx8wSqb8ZL4j2zopUp9VisMOI202UEnvFDBtOkVGJSxxYbFjifIB7NCJBn788w+3k+k4IbOg537VdyoK2PMBR8/TDdjImWhWHY1i7+345ejwmzHL7ZPfb6GTNnQTWkajT77/n6Yk41twR5vvegOSTKuuO++WN/pUks4PGqtcQe9fnSfx2OcOq1ofLiG+JDorJ7z8kHSG13wHLq+QYMDayQbyJEYpDzmn/w3Ou1s2o0a7A41+cIkRzAgH9y3v4lgjp9GcMP2S74ZPA7OecWbFSexM7tL/dYxY=
+  - secure: DKCGc4E9PKeTX68r9pbbNg5qITsN0bApQ1m0x8xdEoi8GLRKVMYNn6ahoAxvy1YsBXC9Zlt5++gLmUV1I1JyDMyJXMr/lZrp4oarW0xWpTBmn3HzOph/K2W4i/fTGgMFieumPEbQIFOnU3JSjK6UJB8qVGEXD2OqS7A//EdrGDbAYVDL3ZTKE6JUlTNHgaKaNHhn+Dq4aBLTSYPwlLyqo+WNBVUUCKCHOq62ULF8MpX5YGaPFNxKYzircV7HpF1hCbV31dmpkeYT9xztra5V0SIBM27jAcQqGmtHH2mhx1sLu+gjhFJbbtY6cggA9EedzYYLDx/NPmgfyuOJfyVbSwTF3vhDUYfskqc1THWpwOSKO0Ry+8/xYb9crxg+FSwuI5hnfkIFk9woBvRGBhjto3/1buMNY9dSFiWtEbN6Let8e747l0wIGJCpJxSeh7vn7F1mWjixhf9GX1+V9BrUvGTd3XJDNb9cVnafYa1RTj8BLteA4HBza7Z9R3dvG4YWp16L/94UuaTzgAQfERLTZGopQth/hsaVTlYesJmJLF70lGM+W83y3YuNkSaX1zQ5FAIvp7oH0O16t7ISm6GprUFwN2Uox7AAbPZdWHxJbly+D+yCFNcqS3Bz9mV3YCLo690Sy1ePNHr+nCseVfBMo7OYyavSS/EjPWfEy65Wq04=

.travis/build.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+git fetch --unshallow #required for commit count
+
+if [ -z "$TRAVIS_TAG" ]; then
+    ./gradlew clean assembleStandardDebug
+
+    COMMIT_COUNT=$(git rev-list --count HEAD)
+    export ARTIFACT="tachiyomi-r${COMMIT_COUNT}.apk"
+
+    mv app/build/outputs/apk/standard/debug/app-standard-debug.apk $ARTIFACT
+else
+    ./gradlew clean assembleStandardRelease
+
+    TOOLS="$(ls -d ${ANDROID_HOME}/build-tools/* | tail -1)"
+    export ARTIFACT="tachiyomi-${TRAVIS_TAG}.apk"
+
+    ${TOOLS}/zipalign -v -p 4 app/build/outputs/apk/standard/release/app-standard-release-unsigned.apk app-aligned.apk
+    ${TOOLS}/apksigner sign --ks $STORE_PATH --ks-key-alias $STORE_ALIAS --ks-pass env:STORE_PASS --key-pass env:KEY_PASS --out $ARTIFACT app-aligned.apk
+fi

.travis/deploy.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+pattern="tachiyomi-r*"
+files=( $pattern )
+export ARTIFACT="${files[0]}"
+
+if [ -z "$ARTIFACT" ]; then
+    echo "Artifact not found"
+    exit 1
+fi
+
+export SSHOPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${DEPLOY_KEY}"
+
+scp $SSHOPTIONS $ARTIFACT $DEPLOY_USER@$DEPLOY_HOST:builds/
+ssh $SSHOPTIONS $DEPLOY_USER@$DEPLOY_HOST ln -sf $ARTIFACT builds/latest

README.md

@@ -1,6 +1,6 @@
 | Build | Download | F-Droid | Contribute | Contact |
 |-------|----------|---------|------------|---------|
-| [![TeamCity (simple build status)](https://img.shields.io/teamcity/https/teamcity.kanade.eu/s/tachiyomi_Build.svg)](https://teamcity.kanade.eu/project.html?projectId=tachiyomi) [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest/app-debug.apk) | [![fdroid release](https://img.shields.io/badge/stable-f--droid.org-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid dev](https://img.shields.io/badge/dev-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions) | [![Translation status](http://weblate.j2ghz.com/widgets/tachiyomi/-/svg-badge.svg)](https://github.com/inorichi/tachiyomi/wiki/Translation) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/WrBkRk4) |
+| [![Travis](https://img.shields.io/travis/inorichi/tachiyomi.svg)](https://travis-ci.org/inorichi/tachiyomi) | [![stable release](https://img.shields.io/github/release/inorichi/tachiyomi.svg?maxAge=3600&label=stable)](https://github.com/inorichi/tachiyomi/releases) [![latest dev build](https://img.shields.io/badge/dev-latest%20build-blue.svg)](http://tachiyomi.kanade.eu/latest) | [![fdroid release](https://img.shields.io/badge/stable-f--droid.org-blue.svg)](https://f-droid.org/repository/browse/?fdid=eu.kanade.tachiyomi) [![fdroid dev](https://img.shields.io/badge/dev-wiki-blue.svg)](//github.com/inorichi/tachiyomi/wiki/FDroid-for-dev-versions) | [![Translation status](http://weblate.j2ghz.com/widgets/tachiyomi/-/svg-badge.svg)](https://github.com/inorichi/tachiyomi/wiki/Translation) | [![Discord](https://img.shields.io/discord/349436576037732353.svg)](https://discord.gg/WrBkRk4) |
 
 ### **Contact us on [Discord](https://discord.gg/WrBkRk4)**
 If you want to open an issue, please read [contributing guidelines](https://github.com/inorichi/tachiyomi/blob/master/.github/CONTRIBUTING.md). Your issue may be closed otherwise.

app/build.gradle

@@ -3,10 +3,10 @@ import java.text.SimpleDateFormat
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.github.zellius.shortcut-helper'
 
-if (file("custom.gradle").exists()) {
+shortcutHelper.filePath = './shortcuts.xml'
-    apply from: "custom.gradle"
-}
 
 ext {
     // Git is needed in your system PATH for these commands to work.
@@ -29,17 +29,17 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "27.0.1"
     publishNonDefault true
 
     defaultConfig {
         applicationId "eu.kanade.tachiyomi"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 25
+        versionCode 29
-        versionName "0.6.2"
+        versionName "0.6.6"
 
         buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\""
         buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\""
@@ -67,15 +67,20 @@ android {
         }
     }
 
+    flavorDimensions "default"
+
     productFlavors {
         standard {
             buildConfigField "boolean", "INCLUDE_UPDATER", "true"
+            dimension "default"
         }
         fdroid {
+            dimension "default"
         }
         dev {
             minSdkVersion 21
             resConfigs "en", "xxhdpi"
+            dimension "default"
         }
     }
 
@@ -97,127 +102,137 @@ android {
 dependencies {
 
     // Modified dependencies
-    compile 'com.github.inorichi:subsampling-scale-image-view:01e5385'
+    implementation 'com.github.inorichi:subsampling-scale-image-view:c19b883'
-    compile 'com.github.inorichi:tachimage:68cd311'
+    implementation 'com.github.inorichi:junrar-android:634c1f5'
-    compile 'com.github.inorichi:junrar-android:634c1f5'
 
     // Android support library
-    final support_library_version = '25.4.0'
+    final support_library_version = '27.0.2'
-    compile "com.android.support:support-v4:$support_library_version"
+    implementation "com.android.support:support-v4:$support_library_version"
-    compile "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:appcompat-v7:$support_library_version"
-    compile "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
-    compile "com.android.support:design:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
-    compile "com.android.support:recyclerview-v7:$support_library_version"
+    implementation "com.android.support:recyclerview-v7:$support_library_version"
-    compile "com.android.support:support-annotations:$support_library_version"
+    implementation "com.android.support:preference-v7:$support_library_version"
-    compile "com.android.support:customtabs:$support_library_version"
+    implementation "com.android.support:support-annotations:$support_library_version"
+    implementation "com.android.support:customtabs:$support_library_version"
 
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
-    compile 'com.android.support:multidex:1.0.1'
+    implementation 'com.android.support:multidex:1.0.2'
 
     // ReactiveX
-    compile 'io.reactivex:rxandroid:1.2.1'
+    implementation 'io.reactivex:rxandroid:1.2.1'
-    compile 'io.reactivex:rxjava:1.3.0'
+    implementation 'io.reactivex:rxjava:1.3.4'
-    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
+    implementation 'com.jakewharton.rxrelay:rxrelay:1.2.0'
-    compile 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
+    implementation 'com.f2prateek.rx.preferences:rx-preferences:1.0.2'
-    compile 'com.github.pwittchen:reactivenetwork:0.7.0'
+    implementation 'com.github.pwittchen:reactivenetwork:0.7.0'
 
     // Network client
-    compile "com.squareup.okhttp3:okhttp:3.8.1"
+    implementation "com.squareup.okhttp3:okhttp:3.9.1"
-    compile 'com.squareup.okio:okio:1.13.0'
+    implementation 'com.squareup.okio:okio:1.13.0'
 
     // REST
     final retrofit_version = '2.3.0'
-    compile "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
 
     // JSON
-    compile 'com.google.code.gson:gson:2.8.1'
+    implementation 'com.google.code.gson:gson:2.8.2'
-    compile 'com.github.salomonbrys.kotson:kotson:2.5.0'
+    implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
 
     // YAML
-    compile 'com.github.bmoliveira:snake-yaml:v1.18-android'
+    implementation 'com.github.bmoliveira:snake-yaml:v1.18-android'
 
     // JavaScript engine
-    compile 'com.squareup.duktape:duktape-android:1.1.0'
+    implementation 'com.squareup.duktape:duktape-android:1.2.0'
 
     // Disk
-    compile 'com.jakewharton:disklrucache:2.0.2'
+    implementation 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.github.seven332:unifile:1.0.0'
+    implementation 'com.github.inorichi:unifile:e9ee588'
 
     // HTML parser
-    compile 'org.jsoup:jsoup:1.10.2'
+    implementation 'org.jsoup:jsoup:1.10.2'
 
     // Job scheduling
-    compile 'com.evernote:android-job:1.1.11'
+    implementation 'com.evernote:android-job:1.2.1'
-    compile 'com.google.android.gms:play-services-gcm:11.0.1'
+    implementation 'com.google.android.gms:play-services-gcm:11.6.2'
 
     // Changelog
-    compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
+    implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
 
     // Database
-    compile "com.pushtorefresh.storio:sqlite:1.13.0"
+    implementation "com.pushtorefresh.storio:sqlite:1.13.0"
 
     // Model View Presenter
     final nucleus_version = '3.0.0'
-    compile "info.android15.nucleus:nucleus:$nucleus_version"
+    implementation "info.android15.nucleus:nucleus:$nucleus_version"
-    compile "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
+    implementation "info.android15.nucleus:nucleus-support-v7:$nucleus_version"
 
     // Dependency injection
-    compile "uy.kohesive.injekt:injekt-core:1.16.1"
+    implementation "uy.kohesive.injekt:injekt-core:1.16.1"
 
     // Image library
-    compile 'com.github.bumptech.glide:glide:3.8.0'
+    final glide_version = '4.3.1'
-    compile 'com.github.bumptech.glide:okhttp3-integration:1.5.0@aar'
+    implementation "com.github.bumptech.glide:glide:$glide_version"
+    implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
+
     // Transformations
-    compile 'jp.wasabeef:glide-transformations:2.0.2'
+    implementation 'jp.wasabeef:glide-transformations:3.0.1'
 
     // Logging
-    compile 'com.jakewharton.timber:timber:4.5.1'
+    implementation 'com.jakewharton.timber:timber:4.6.0'
 
     // Crash reports
-    compile 'ch.acra:acra:4.9.2'
+    implementation 'ch.acra:acra:4.9.2'
 
     // Sort
-    compile 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
+    implementation 'com.github.gpanther:java-nat-sort:natural-comparator-1.1'
 
     // UI
-    compile 'com.dmitrymalkovich.android:material-design-dimens:1.4'
+    implementation 'com.dmitrymalkovich.android:material-design-dimens:1.4'
-    compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
+    implementation 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
-    compile 'eu.davidea:flexible-adapter:5.0.0-rc1'
+    implementation 'eu.davidea:flexible-adapter:5.0.0-rc3'
-    compile 'com.nononsenseapps:filepicker:2.5.2'
+    implementation 'com.nononsenseapps:filepicker:2.5.2'
-    compile 'com.github.amulyakhare:TextDrawable:558677e'
+    implementation 'com.github.amulyakhare:TextDrawable:558677e'
-    compile 'com.afollestad.material-dialogs:core:0.9.4.5'
+    implementation('com.afollestad.material-dialogs:core:0.9.4.7') {
-    compile 'me.zhanghai.android.systemuihelper:library:1.0.0'
+        exclude group: "com.android.support", module: "support-v13"
-    compile 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
+    }
+    implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
+    implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.0.4'
+    implementation 'com.github.mthli:Slice:v1.2'
 
     // Conductor
-    compile "com.bluelinelabs:conductor:2.1.4"
+    implementation "com.bluelinelabs:conductor:2.1.4"
-    compile 'com.github.inorichi:conductor-support-preference:9e36460'
+    implementation 'com.github.inorichi:conductor-support-preference:26.0.2'
 
     // RxBindings
     final rxbindings_version = '1.0.1'
-    compile "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
+    implementation "com.jakewharton.rxbinding:rxbinding-kotlin:$rxbindings_version"
-    compile "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
+    implementation "com.jakewharton.rxbinding:rxbinding-appcompat-v7-kotlin:$rxbindings_version"
-    compile "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
+    implementation "com.jakewharton.rxbinding:rxbinding-support-v4-kotlin:$rxbindings_version"
-    compile "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version"
+    implementation "com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:$rxbindings_version"
 
     // Tests
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
-    testCompile 'org.assertj:assertj-core:1.7.1'
+    testImplementation 'org.assertj:assertj-core:1.7.1'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 
     final robolectric_version = '3.1.4'
-    testCompile "org.robolectric:robolectric:$robolectric_version"
+    testImplementation "org.robolectric:robolectric:$robolectric_version"
-    testCompile "org.robolectric:shadows-multidex:$robolectric_version"
+    testImplementation "org.robolectric:shadows-multidex:$robolectric_version"
-    testCompile "org.robolectric:shadows-play-services:$robolectric_version"
+    testImplementation "org.robolectric:shadows-play-services:$robolectric_version"
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    final coroutines_version = '0.19.1'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 }
 
 buildscript {
-    ext.kotlin_version = '1.1.4'
+    ext.kotlin_version = '1.2.0'
     repositories {
         mavenCentral()
     }
@@ -230,49 +245,11 @@ repositories {
     mavenCentral()
 }
 
-// Workaround to force a support lib version
+kotlin {
-configurations.all {
+    experimental {
-    resolutionStrategy.eachDependency { details ->
+        coroutines 'enable'
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion '25.4.0'
-            }
-        }
     }
 }
-
+androidExtensions {
-// add support for placeholders in resource files
+    experimental = true
-//https://code.google.com/p/android/issues/detail?id=69224
-def replacePlaceholdersInFile(basePath, fileName, placeholders) {
-    def file = new File(basePath, fileName);
-
-    if (!file.exists()) {
-        logger.quiet("Unable to replace placeholders in " + file.toString() + ". File cannot be found.")
-        return;
-    }
-
-    logger.debug("Replacing placeholders in " + file.toString())
-    logger.debug("Placeholders: " + placeholders.toString())
-
-    def content = file.getText('UTF-8')
-
-    placeholders.each { entry ->
-        content = content.replaceAll("\\\$\\{${entry.key}\\}", entry.value)
-    }
-
-    file.write(content, 'UTF-8')
 }
-
-afterEvaluate {
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            output.processResources.doFirst {
-                // prepare placeholder map from manifestPlaceholders including applicationId placeholder
-                def placeholders = variant.mergedFlavor.manifestPlaceholders + [applicationId: variant.applicationId]
-
-                replacePlaceholdersInFile(resDir, 'xml-v25/shortcuts.xml', placeholders)
-            }
-        }
-    }
-}

app/proguard-rules.pro

@@ -6,6 +6,7 @@
 
 -keep class com.hippo.image.** { *; }
 -keep interface com.hippo.image.** { *; }
+-dontwarn nucleus.view.NucleusActionBarActivity
 
 # Extensions may require methods unused in the core app
 -keep class org.jsoup.** { *; }
@@ -23,6 +24,7 @@
 # Glide specific rules #
 # https://github.com/bumptech/glide
 -keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.AppGlideModule
 -keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
     **[] $VALUES;
     public *;

app/shortcuts.xml

@@ -9,8 +9,7 @@
         android:shortcutShortLabel="@string/label_library">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_LIBRARY"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
     <shortcut
         android:enabled="true"
@@ -21,8 +20,7 @@
         android:shortcutShortLabel="@string/short_recent_updates">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
     <shortcut
         android:enabled="true"
@@ -33,8 +31,7 @@
         android:shortcutShortLabel="@string/label_recent_manga">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
     <shortcut
         android:enabled="true"
@@ -45,7 +42,6 @@
         android:shortcutShortLabel="@string/label_catalogues">
         <intent
             android:action="eu.kanade.tachiyomi.SHOW_CATALOGUES"
-            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity"
+            android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
-            android:targetPackage="${applicationId}" />
     </shortcut>
 </shortcuts>

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
@@ -24,11 +25,11 @@
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <meta-data android:name="android.app.shortcuts"
+
-                android:resource="@xml/shortcuts"/>
+            <!--suppress AndroidDomInspection -->
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity>
         <activity
             android:name=".ui.reader.ReaderActivity"
@@ -96,10 +97,6 @@
             android:name=".data.backup.BackupRestoreService"
             android:exported="false"/>
 
-        <meta-data
-            android:name="eu.kanade.tachiyomi.data.glide.AppGlideModule"
-            android:value="GlideModule" />
-
     </application>
 
 </manifest>

app/src/main/java/eu/kanade/tachiyomi/App.kt

@@ -7,6 +7,7 @@ import android.support.multidex.MultiDex
 import com.evernote.android.job.JobManager
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.updater.UpdateCheckerJob
 import eu.kanade.tachiyomi.util.LocaleHelper
 import org.acra.ACRA
@@ -34,6 +35,7 @@ open class App : Application() {
 
         setupAcra()
         setupJobManager()
+        setupNotificationChannels()
 
         LocaleHelper.updateConfiguration(this, resources.configuration)
     }
@@ -65,4 +67,8 @@ open class App : Application() {
         }
     }
 
+    protected open fun setupNotificationChannels() {
+        Notifications.createChannels(this)
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/Constants.kt

@@ -1,10 +0,0 @@
-package eu.kanade.tachiyomi
-
-object Constants {
-    const val NOTIFICATION_LIBRARY_PROGRESS_ID = 1
-    const val NOTIFICATION_LIBRARY_RESULT_ID = 2
-    const val NOTIFICATION_UPDATER_ID = 3
-    const val NOTIFICATION_DOWNLOAD_CHAPTER_ID = 4
-    const val NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID = 5
-    const val NOTIFICATION_DOWNLOAD_IMAGE_ID = 6
-}

app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

@@ -45,6 +45,16 @@ object Migrations {
                     }
                 }
             }
+            if (oldVersion < 26) {
+                // Delete external chapter cache dir.
+                val extCache = context.externalCacheDir
+                if (extCache != null) {
+                    val chapterCache = File(extCache, "chapter_disk_cache")
+                    if (chapterCache.exists()) {
+                        chapterCache.deleteRecursively()
+                    }
+                }
+            }
             return true
         }
         return false

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreateService.kt

@@ -46,7 +46,7 @@ class BackupCreateService : IntentService(NAME) {
          * Make a backup from library
          *
          * @param context context of application
-         * @param path path of Uri
+         * @param uri path of Uri
          * @param flags determines what to backup
          * @param isJob backup called from job
          */
@@ -80,13 +80,10 @@ class BackupCreateService : IntentService(NAME) {
      * @param uri path of Uri
      * @param isJob backup called from job
      */
-    fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
+    private fun createBackupFromApp(uri: Uri, flags: Int, isJob: Boolean) {
         // Create root object
         val root = JsonObject()
 
-        // Create information object
-        val information = JsonObject()
-
         // Create manga array
         val mangaEntries = JsonArray()
 
@@ -116,8 +113,9 @@ class BackupCreateService : IntentService(NAME) {
         try {
             // When BackupCreatorJob
             if (isJob) {
-                // Get dir of file
+                // Get dir of file and create
-                val dir = UniFile.fromUri(this, uri)
+                var dir = UniFile.fromUri(this, uri)
+                dir = dir.createDirectory("automatic")
 
                 // Delete older backups
                 val numberOfBackups = backupManager.numberOfBackups()

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreatorJob.kt

@@ -8,13 +8,12 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
-import java.io.File
 
 class BackupCreatorJob : Job() {
 
     override fun onRunJob(params: Params): Result {
         val preferences = Injekt.get<PreferencesHelper>()
-        val uri = Uri.fromFile(File(preferences.backupsDirectory().getOrDefault()))
+        val uri = Uri.parse(preferences.backupsDirectory().getOrDefault())
         val flags = BackupCreateService.BACKUP_ALL
         BackupCreateService.makeBackup(context, uri, flags, true)
         return Result.SUCCESS
@@ -29,7 +28,6 @@ class BackupCreatorJob : Job() {
             if (interval > 0) {
                 JobRequest.Builder(TAG)
                         .setPeriodic(interval * 60 * 60 * 1000L, 10 * 60 * 1000)
-                        .setPersisted(true)
                         .setUpdateCurrent(true)
                         .build()
                         .schedule()

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt

@@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.*
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.util.syncChaptersWithSource
@@ -41,6 +42,11 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      */
     internal val sourceManager: SourceManager by injectLazy()
 
+    /**
+     * Tracking manager
+     */
+    internal val trackManager: TrackManager by injectLazy()
+
     /**
      * Version of parser
      */
@@ -67,18 +73,16 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         parser = initParser()
     }
 
-    private fun initParser(): Gson {
+    private fun initParser(): Gson = when (version) {
-        return when (version) {
+        1 -> GsonBuilder().create()
-            1 -> GsonBuilder().create()
+        2 -> GsonBuilder()
-            2 -> GsonBuilder()
+                .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
-                    .registerTypeAdapter<MangaImpl>(MangaTypeAdapter.build())
+                .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
-                    .registerTypeHierarchyAdapter<ChapterImpl>(ChapterTypeAdapter.build())
+                .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
-                    .registerTypeAdapter<CategoryImpl>(CategoryTypeAdapter.build())
+                .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
-                    .registerTypeAdapter<DHistory>(HistoryTypeAdapter.build())
+                .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
-                    .registerTypeHierarchyAdapter<TrackImpl>(TrackTypeAdapter.build())
+                .create()
-                    .create()
+        else -> throw Exception("Json version unknown")
-            else -> throw Exception("Json version unknown")
-        }
     }
 
     /**
@@ -300,23 +304,26 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
         val trackToUpdate = ArrayList<Track>()
 
         for (track in tracks) {
-            var isInDatabase = false
+            val service = trackManager.getService(track.sync_id)
-            for (dbTrack in dbTracks) {
+            if (service != null && service.isLogged) {
-                if (track.sync_id == dbTrack.sync_id) {
+                var isInDatabase = false
-                    // The sync is already in the db, only update its fields
+                for (dbTrack in dbTracks) {
-                    if (track.remote_id != dbTrack.remote_id) {
+                    if (track.sync_id == dbTrack.sync_id) {
-                        dbTrack.remote_id = track.remote_id
+                        // The sync is already in the db, only update its fields
+                        if (track.remote_id != dbTrack.remote_id) {
+                            dbTrack.remote_id = track.remote_id
+                        }
+                        dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
+                        isInDatabase = true
+                        trackToUpdate.add(dbTrack)
+                        break
                     }
-                    dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
-                    isInDatabase = true
-                    trackToUpdate.add(dbTrack)
-                    break
                 }
-            }
+                if (!isInDatabase) {
-            if (!isInDatabase) {
+                    // Insert new sync. Let the db assign the id
-                // Insert new sync. Let the db assign the id
+                    track.id = null
-                track.id = null
+                    trackToUpdate.add(track)
-                trackToUpdate.add(track)
+                }
             }
         }
         // Update database
@@ -361,32 +368,29 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      *
      * @return [Manga], null if not found
      */
-    internal fun getMangaFromDatabase(manga: Manga): Manga? {
+    internal fun getMangaFromDatabase(manga: Manga): Manga? =
-        return databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
+            databaseHelper.getManga(manga.url, manga.source).executeAsBlocking()
-    }
 
     /**
      * Returns list containing manga from library
      *
      * @return [Manga] from library
      */
-    internal fun getFavoriteManga(): List<Manga> {
+    internal fun getFavoriteManga(): List<Manga> =
-        return databaseHelper.getFavoriteMangas().executeAsBlocking()
+            databaseHelper.getFavoriteMangas().executeAsBlocking()
-    }
 
     /**
      * Inserts manga and returns id
      *
      * @return id of [Manga], null if not found
      */
-    internal fun insertManga(manga: Manga): Long? {
+    internal fun insertManga(manga: Manga): Long? =
-        return databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
+            databaseHelper.insertManga(manga).executeAsBlocking().insertedId()
-    }
 
     /**
      * Inserts list of chapters
      */
-    internal fun insertChapters(chapters: List<Chapter>) {
+    private fun insertChapters(chapters: List<Chapter>) {
         databaseHelper.updateChaptersBackup(chapters).executeAsBlocking()
     }
 
@@ -395,7 +399,5 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
      *
      * @return number of backups selected by user
      */
-    fun numberOfBackups(): Int {
+    fun numberOfBackups(): Int = preferences.numberOfBackups().getOrDefault()
-        return preferences.numberOfBackups().getOrDefault()
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt

@@ -21,6 +21,7 @@ import eu.kanade.tachiyomi.data.backup.models.Backup.VERSION
 import eu.kanade.tachiyomi.data.backup.models.DHistory
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.*
+import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.util.chop
 import eu.kanade.tachiyomi.util.isServiceRunning
@@ -49,9 +50,8 @@ class BackupRestoreService : Service() {
          * @param context the application context.
          * @return true if the service is running, false otherwise.
          */
-        fun isRunning(context: Context): Boolean {
+        private fun isRunning(context: Context): Boolean =
-            return context.isServiceRunning(BackupRestoreService::class.java)
+                context.isServiceRunning(BackupRestoreService::class.java)
-        }
 
         /**
          * Starts a service to restore a backup from Json
@@ -113,7 +113,13 @@ class BackupRestoreService : Service() {
      */
     private val db: DatabaseHelper by injectLazy()
 
-    lateinit var executor: ExecutorService
+    /**
+     * Tracking manager
+     */
+    internal val trackManager: TrackManager by injectLazy()
+
+
+    private lateinit var executor: ExecutorService
 
     /**
      * Method called when the service is created. It injects dependencies and acquire the wake lock.
@@ -142,9 +148,7 @@ class BackupRestoreService : Service() {
     /**
      * This method needs to be implemented, but it's not used/needed.
      */
-    override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder? = null
-        return null
-    }
 
     /**
      * Method called when the service receives an intent.
@@ -164,7 +168,7 @@ class BackupRestoreService : Service() {
 
         subscription = Observable.using(
                 { db.lowLevel().beginTransaction() },
-                { getRestoreObservable(uri).doOnNext{ db.lowLevel().setTransactionSuccessful() } },
+                { getRestoreObservable(uri).doOnNext { db.lowLevel().setTransactionSuccessful() } },
                 { executor.execute { db.lowLevel().endTransaction() } })
                 .doAfterTerminate { stopSelf(startId) }
                 .subscribeOn(Schedulers.from(executor))
@@ -182,29 +186,33 @@ class BackupRestoreService : Service() {
     private fun getRestoreObservable(uri: Uri): Observable<List<Manga>> {
         val startTime = System.currentTimeMillis()
 
-        val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
+        return Observable.just(Unit)
-        val json = JsonParser().parse(reader).asJsonObject
+                .map {
+                    val reader = JsonReader(contentResolver.openInputStream(uri).bufferedReader())
+                    val json = JsonParser().parse(reader).asJsonObject
 
-        // Get parser version
+                    // Get parser version
-        val version = json.get(VERSION)?.asInt ?: 1
+                    val version = json.get(VERSION)?.asInt ?: 1
 
-        // Initialize manager
+                    // Initialize manager
-        backupManager = BackupManager(this, version)
+                    backupManager = BackupManager(this, version)
 
-        val mangasJson = json.get(MANGAS).asJsonArray
+                    val mangasJson = json.get(MANGAS).asJsonArray
 
-        restoreAmount = mangasJson.size() + 1 // +1 for categories
+                    restoreAmount = mangasJson.size() + 1 // +1 for categories
-        restoreProgress = 0
+                    restoreProgress = 0
-        errors.clear()
+                    errors.clear()
 
-        // Restore categories
+                    // Restore categories
-        json.get(CATEGORIES)?.let {
+                    json.get(CATEGORIES)?.let {
-            backupManager.restoreCategories(it.asJsonArray)
+                        backupManager.restoreCategories(it.asJsonArray)
-            restoreProgress += 1
+                        restoreProgress += 1
-            showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
+                        showRestoreProgress(restoreProgress, restoreAmount, "Categories added", errors.size)
-        }
+                    }
 
-        return Observable.from(mangasJson)
+                    mangasJson
+                }
+                .flatMap { Observable.from(it) }
                 .concatMap {
                     val obj = it.asJsonObject
                     val manga = backupManager.parser.fromJson<MangaImpl>(obj.get(MANGA))
@@ -290,14 +298,14 @@ class BackupRestoreService : Service() {
         val source = backupManager.sourceManager.get(manga.source) ?: return null
         val dbManga = backupManager.getMangaFromDatabase(manga)
 
-        if (dbManga == null) {
+        return if (dbManga == null) {
             // Manga not in database
-            return mangaFetchObservable(source, manga, chapters, categories, history, tracks)
+            mangaFetchObservable(source, manga, chapters, categories, history, tracks)
         } else { // Manga in database
             // Copy information from manga already in database
             backupManager.restoreMangaNoFetch(manga, dbManga)
             // Fetch rest of manga information
-            return mangaNoFetchObservable(source, manga, chapters, categories, history, tracks)
+            mangaNoFetchObservable(source, manga, chapters, categories, history, tracks)
         }
     }
 
@@ -317,20 +325,18 @@ class BackupRestoreService : Service() {
                     manga
                 }
                 .filter { it.id != null }
-                .flatMap { manga ->
+                .flatMap {
-                    chapterFetchObservable(source, manga, chapters)
+                    chapterFetchObservable(source, it, chapters)
                             // Convert to the manga that contains new chapters.
                             .map { manga }
                 }
                 .doOnNext {
-                    // Restore categories
+                    restoreExtraForManga(it, categories, history, tracks)
-                    backupManager.restoreCategoriesForManga(it, categories)
+                }
-
+                .flatMap {
-                    // Restore history
+                    trackingFetchObservable(it, tracks)
-                    backupManager.restoreHistoryForManga(history)
+                            // Convert to the manga that contains new chapters.
-
+                            .map { manga }
-                    // Restore tracking
-                    backupManager.restoreTrackForManga(it, tracks)
                 }
                 .doOnCompleted {
                     restoreProgress += 1
@@ -352,14 +358,12 @@ class BackupRestoreService : Service() {
                     }
                 }
                 .doOnNext {
-                    // Restore categories
+                    restoreExtraForManga(it, categories, history, tracks)
-                    backupManager.restoreCategoriesForManga(it, categories)
+                }
-
+                .flatMap { manga ->
-                    // Restore history
+                    trackingFetchObservable(manga, tracks)
-                    backupManager.restoreHistoryForManga(history)
+                            // Convert to the manga that contains new chapters.
-
+                            .map { manga }
-                    // Restore tracking
-                    backupManager.restoreTrackForManga(it, tracks)
                 }
                 .doOnCompleted {
                     restoreProgress += 1
@@ -367,6 +371,17 @@ class BackupRestoreService : Service() {
                 }
     }
 
+    private fun restoreExtraForManga(manga: Manga, categories: List<String>, history: List<DHistory>, tracks: List<Track>) {
+        // Restore categories
+        backupManager.restoreCategoriesForManga(manga, categories)
+
+        // Restore history
+        backupManager.restoreHistoryForManga(history)
+
+        // Restore tracking
+        backupManager.restoreTrackForManga(manga, tracks)
+    }
+
     /**
      * [Observable] that fetches chapter information
      *
@@ -379,10 +394,33 @@ class BackupRestoreService : Service() {
                 // If there's any error, return empty update and continue.
                 .onErrorReturn {
                     errors.add(Date() to "${manga.title} - ${it.message}")
-                    Pair(emptyList<Chapter>(), emptyList<Chapter>())
+                    Pair(emptyList(), emptyList())
                 }
     }
 
+    /**
+     * [Observable] that refreshes tracking information
+     * @param manga manga that needs updating.
+     * @param tracks list containing tracks from restore file.
+     * @return [Observable] that contains updated track item
+     */
+    private fun trackingFetchObservable(manga: Manga, tracks: List<Track>): Observable<Track> {
+        return Observable.from(tracks)
+                .concatMap { track ->
+                    val service = trackManager.getService(track.sync_id)
+                    if (service != null && service.isLogged) {
+                        service.refresh(track)
+                                .doOnNext { db.insertTrack(it).executeAsBlocking() }
+                                .onErrorReturn {
+                                    errors.add(Date() to "${manga.title} - ${it.message}")
+                                    track
+                                }
+                    } else {
+                        errors.add(Date() to "${manga.title} - ${service?.name} not logged in")
+                        Observable.empty()
+                    }
+                }
+    }
 
     /**
      * Called to update dialog in [BackupConst]

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

@@ -44,13 +44,8 @@ class ChapterCache(private val context: Context) {
     /** Google Json class used for parsing JSON files.  */
     private val gson: Gson by injectLazy()
 
-    /** Parent directory of the cache. Ensure not null and not root directory or fallback
-     * to internal cache directory. **/
-    private val basePath = context.externalCacheDir?.takeIf { it.absolutePath.length > 1 }
-            ?: context.cacheDir
-
     /** Cache class used for cache management.  */
-    private val diskCache = DiskLruCache.open(File(basePath, PARAMETER_CACHE_DIRECTORY),
+    private val diskCache = DiskLruCache.open(File(context.cacheDir, PARAMETER_CACHE_DIRECTORY),
             PARAMETER_APP_VERSION,
             PARAMETER_VALUE_COUNT,
             PARAMETER_CACHE_SIZE)
@@ -86,10 +81,10 @@ class ChapterCache(private val context: Context) {
 
         try {
             // Remove the extension from the file to get the key of the cache
-            val key = file.substring(0, file.lastIndexOf("."))
+            val key = file.substringBeforeLast(".")
             // Remove file from cache.
             return diskCache.remove(key)
-        } catch (e: IOException) {
+        } catch (e: Exception) {
             return false
         }
     }

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

@@ -20,7 +20,8 @@ class CoverCache(private val context: Context) {
     /**
      * Cache directory used for cache management.
      */
-    private val cacheDir = context.getExternalFilesDir("covers")
+    private val cacheDir = context.getExternalFilesDir("covers") ?:
+            File(context.filesDir, "covers").also { it.mkdirs() }
 
     /**
      * Returns the cover from cache.

app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt

@@ -65,9 +65,8 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
     }
 }
 
-open class MangaGetResolver : DefaultGetResolver<Manga>() {
+interface BaseMangaGetResolver {
-
+    fun mapBaseFromCursor(manga: Manga, cursor: Cursor) = manga.apply {
-    override fun mapFromCursor(cursor: Cursor): Manga = MangaImpl().apply {
         id = cursor.getLong(cursor.getColumnIndex(COL_ID))
         source = cursor.getLong(cursor.getColumnIndex(COL_SOURCE))
         url = cursor.getString(cursor.getColumnIndex(COL_URL))
@@ -86,6 +85,13 @@ open class MangaGetResolver : DefaultGetResolver<Manga>() {
     }
 }
 
+open class MangaGetResolver : DefaultGetResolver<Manga>(), BaseMangaGetResolver {
+
+    override fun mapFromCursor(cursor: Cursor): Manga {
+        return mapBaseFromCursor(MangaImpl(), cursor)
+    }
+}
+
 class MangaDeleteResolver : DefaultDeleteResolver<Manga>() {
 
     override fun mapToDeleteQuery(obj: Manga) = DeleteQuery.builder()

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

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.data.database.models
+
+class LibraryManga : MangaImpl() {
+
+    var unread: Int = 0
+
+    var category: Int = 0
+
+}

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

@@ -16,10 +16,6 @@ interface Manga : SManga {
 
     var chapter_flags: Int
 
-    var unread: Int
-
-    var category: Int
-
     fun setChapterOrder(order: Int) {
         setFlags(order, SORT_MASK)
     }

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

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.data.database.models
 
-class MangaImpl : Manga {
+open class MangaImpl : Manga {
 
     override var id: Long? = null
 
@@ -32,10 +32,6 @@ class MangaImpl : Manga {
 
     override var chapter_flags: Int = 0
 
-    @Transient override var unread: Int = 0
-
-    @Transient override var category: Int = 0
-
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other == null || javaClass != other.javaClass) return false

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt

@@ -4,6 +4,7 @@ import com.pushtorefresh.storio.sqlite.queries.DeleteQuery
 import com.pushtorefresh.storio.sqlite.queries.Query
 import com.pushtorefresh.storio.sqlite.queries.RawQuery
 import eu.kanade.tachiyomi.data.database.DbProvider
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.resolvers.LibraryMangaGetResolver
 import eu.kanade.tachiyomi.data.database.resolvers.MangaFlagsPutResolver
@@ -23,7 +24,7 @@ interface MangaQueries : DbProvider {
             .prepare()
 
     fun getLibraryMangas() = db.get()
-            .listOfObjects(Manga::class.java)
+            .listOfObjects(LibraryManga::class.java)
             .withQuery(RawQuery.builder()
                     .query(libraryQuery)
                     .observesTables(MangaTable.TABLE, ChapterTable.TABLE, MangaCategoryTable.TABLE, CategoryTable.TABLE)

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

@@ -1,24 +1,23 @@
 package eu.kanade.tachiyomi.data.database.resolvers
 
 import android.database.Cursor
-import eu.kanade.tachiyomi.data.database.mappers.MangaGetResolver
+import com.pushtorefresh.storio.sqlite.operations.get.DefaultGetResolver
-import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.mappers.BaseMangaGetResolver
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 
-class LibraryMangaGetResolver : MangaGetResolver() {
+class LibraryMangaGetResolver : DefaultGetResolver<LibraryManga>(), BaseMangaGetResolver {
 
     companion object {
         val INSTANCE = LibraryMangaGetResolver()
     }
 
-    override fun mapFromCursor(cursor: Cursor): Manga {
+    override fun mapFromCursor(cursor: Cursor): LibraryManga {
-        val manga = super.mapFromCursor(cursor)
+        val manga = LibraryManga()
 
-        val unreadColumn = cursor.getColumnIndex(MangaTable.COL_UNREAD)
+        mapBaseFromCursor(manga, cursor)
-        manga.unread = cursor.getInt(unreadColumn)
+        manga.unread = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_UNREAD))
-
+        manga.category = cursor.getInt(cursor.getColumnIndex(MangaTable.COL_CATEGORY))
-        val categoryColumn = cursor.getColumnIndex(MangaTable.COL_CATEGORY)
-        manga.category = cursor.getInt(categoryColumn)
 
         return manga
     }

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt

@@ -0,0 +1,252 @@
+package eu.kanade.tachiyomi.data.download
+
+import android.content.Context
+import android.net.Uri
+import com.hippo.unifile.UniFile
+import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.source.SourceManager
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.util.concurrent.TimeUnit
+
+/**
+ * Cache where we dump the downloads directory from the filesystem. This class is needed because
+ * directory checking is expensive and it slowdowns the app. The cache is invalidated by the time
+ * defined in [renewInterval] as we don't have any control over the filesystem and the user can
+ * delete the folders at any time without the app noticing.
+ *
+ * @param context the application context.
+ * @param provider the downloads directories provider.
+ * @param sourceManager the source manager.
+ * @param preferences the preferences of the app.
+ */
+class DownloadCache(private val context: Context,
+                    private val provider: DownloadProvider,
+                    private val sourceManager: SourceManager = Injekt.get(),
+                    private val preferences: PreferencesHelper = Injekt.get()) {
+
+    /**
+     * The interval after which this cache should be invalidated. 1 hour shouldn't cause major
+     * issues, as the cache is only used for UI feedback.
+     */
+    private val renewInterval = TimeUnit.HOURS.toMillis(1)
+
+    /**
+     * The last time the cache was refreshed.
+     */
+    private var lastRenew = 0L
+
+    /**
+     * The root directory for downloads.
+     */
+    private var rootDir = RootDirectory(getDirectoryFromPreference())
+
+    init {
+        preferences.downloadsDirectory().asObservable()
+                .skip(1)
+                .subscribe {
+                    lastRenew = 0L // invalidate cache
+                    rootDir = RootDirectory(getDirectoryFromPreference())
+                }
+    }
+
+    /**
+     * Returns the downloads directory from the user's preferences.
+     */
+    private fun getDirectoryFromPreference(): UniFile {
+        val dir = preferences.downloadsDirectory().getOrDefault()
+        return UniFile.fromUri(context, Uri.parse(dir))
+    }
+
+    /**
+     * Returns true if the chapter is downloaded.
+     *
+     * @param chapter the chapter to check.
+     * @param manga the manga of the chapter.
+     * @param skipCache whether to skip the directory cache and check in the filesystem.
+     */
+    fun isChapterDownloaded(chapter: Chapter, manga: Manga, skipCache: Boolean): Boolean {
+        if (skipCache) {
+            val source = sourceManager.get(manga.source) ?: return false
+            return provider.findChapterDir(chapter, manga, source) != null
+        }
+
+        checkRenew()
+
+        val sourceDir = rootDir.files[manga.source]
+        if (sourceDir != null) {
+            val mangaDir = sourceDir.files[provider.getMangaDirName(manga)]
+            if (mangaDir != null) {
+                return provider.getChapterDirName(chapter) in mangaDir.files
+            }
+        }
+        return false
+    }
+
+    /**
+     * Returns the amount of downloaded chapters for a manga.
+     *
+     * @param manga the manga to check.
+     */
+    fun getDownloadCount(manga: Manga): Int {
+        checkRenew()
+
+        val sourceDir = rootDir.files[manga.source]
+        if (sourceDir != null) {
+            val mangaDir = sourceDir.files[provider.getMangaDirName(manga)]
+            if (mangaDir != null) {
+                return mangaDir.files.size
+            }
+        }
+        return 0
+    }
+
+    /**
+     * Checks if the cache needs a renewal and performs it if needed.
+     */
+    @Synchronized
+    private fun checkRenew() {
+        if (lastRenew + renewInterval < System.currentTimeMillis()) {
+            renew()
+            lastRenew = System.currentTimeMillis()
+        }
+    }
+
+    /**
+     * Renews the downloads cache.
+     */
+    private fun renew() {
+        val onlineSources = sourceManager.getOnlineSources()
+
+        val sourceDirs = rootDir.dir.listFiles()
+                .orEmpty()
+                .associate { it.name to SourceDirectory(it) }
+                .mapNotNullKeys { entry ->
+                    onlineSources.find { provider.getSourceDirName(it) == entry.key }?.id
+                }
+
+        rootDir.files = sourceDirs
+
+        sourceDirs.values.forEach { sourceDir ->
+            val mangaDirs = sourceDir.dir.listFiles()
+                    .orEmpty()
+                    .associateNotNullKeys { it.name to MangaDirectory(it) }
+
+            sourceDir.files = mangaDirs
+
+            mangaDirs.values.forEach { mangaDir ->
+                val chapterDirs = mangaDir.dir.listFiles()
+                        .orEmpty()
+                        .mapNotNull { it.name }
+                        .toHashSet()
+
+                mangaDir.files = chapterDirs
+            }
+        }
+    }
+
+    /**
+     * Adds a chapter that has just been download to this cache.
+     *
+     * @param chapterDirName the downloaded chapter's directory name.
+     * @param mangaUniFile the directory of the manga.
+     * @param manga the manga of the chapter.
+     */
+    @Synchronized
+    fun addChapter(chapterDirName: String, mangaUniFile: UniFile, manga: Manga) {
+        // Retrieve the cached source directory or cache a new one
+        var sourceDir = rootDir.files[manga.source]
+        if (sourceDir == null) {
+            val source = sourceManager.get(manga.source) ?: return
+            val sourceUniFile = provider.findSourceDir(source) ?: return
+            sourceDir = SourceDirectory(sourceUniFile)
+            rootDir.files += manga.source to sourceDir
+        }
+
+        // Retrieve the cached manga directory or cache a new one
+        val mangaDirName = provider.getMangaDirName(manga)
+        var mangaDir = sourceDir.files[mangaDirName]
+        if (mangaDir == null) {
+            mangaDir = MangaDirectory(mangaUniFile)
+            sourceDir.files += mangaDirName to mangaDir
+        }
+
+        // Save the chapter directory
+        mangaDir.files += chapterDirName
+    }
+
+    /**
+     * Removes a chapter that has been deleted from this cache.
+     *
+     * @param chapter the chapter to remove.
+     * @param manga the manga of the chapter.
+     */
+    @Synchronized
+    fun removeChapter(chapter: Chapter, manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDir = sourceDir.files[provider.getMangaDirName(manga)] ?: return
+        val chapterDirName = provider.getChapterDirName(chapter)
+        if (chapterDirName in mangaDir.files) {
+            mangaDir.files -= chapterDirName
+        }
+    }
+
+    /**
+     * Removes a manga that has been deleted from this cache.
+     *
+     * @param manga the manga to remove.
+     */
+    @Synchronized
+    fun removeManga(manga: Manga) {
+        val sourceDir = rootDir.files[manga.source] ?: return
+        val mangaDirName = provider.getMangaDirName(manga)
+        if (mangaDirName in sourceDir.files) {
+            sourceDir.files -= mangaDirName
+        }
+    }
+
+    /**
+     * Class to store the files under the root downloads directory.
+     */
+    private class RootDirectory(val dir: UniFile,
+                                var files: Map<Long, SourceDirectory> = hashMapOf())
+
+    /**
+     * Class to store the files under a source directory.
+     */
+    private class SourceDirectory(val dir: UniFile,
+                                  var files: Map<String, MangaDirectory> = hashMapOf())
+
+    /**
+     * Class to store the files under a manga directory.
+     */
+    private class MangaDirectory(val dir: UniFile,
+                                 var files: Set<String> = hashSetOf())
+
+    /**
+     * Returns a new map containing only the key entries of [transform] that are not null.
+     */
+    private inline fun <K, V, R> Map<out K, V>.mapNotNullKeys(transform: (Map.Entry<K?, V>) -> R?): Map<R, V> {
+        val destination = LinkedHashMap<R, V>()
+        forEach { element -> transform(element)?.let { destination.put(it, element.value) } }
+        return destination
+    }
+
+    /**
+     * Returns a map from a list containing only the key entries of [transform] that are not null.
+     */
+    private inline fun <T, K, V> Array<T>.associateNotNullKeys(transform: (T) -> Pair<K?, V>): Map<K, V> {
+        val destination = LinkedHashMap<K, V>()
+        for (element in this) {
+            val (key, value) = transform(element)
+            if (key != null) {
+                destination.put(key, value)
+            }
+        }
+        return destination
+    }
+
+}

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

@@ -24,10 +24,15 @@ class DownloadManager(context: Context) {
      */
     private val provider = DownloadProvider(context)
 
+    /**
+     * Cache of downloaded chapters.
+     */
+    private val cache = DownloadCache(context, provider)
+
     /**
      * Downloader whose only task is to download chapters.
      */
-    private val downloader = Downloader(context, provider)
+    private val downloader = Downloader(context, provider, cache)
 
     /**
      * Downloads queue, where the pending chapters are stored.
@@ -80,9 +85,10 @@ class DownloadManager(context: Context) {
      *
      * @param manga the manga of the chapters.
      * @param chapters the list of chapters to enqueue.
+     * @param autoStart whether to start the downloader after enqueing the chapters.
      */
-    fun downloadChapters(manga: Manga, chapters: List<Chapter>) {
+    fun downloadChapters(manga: Manga, chapters: List<Chapter>, autoStart: Boolean = true) {
-        downloader.queueChapters(manga, chapters)
+        downloader.queueChapters(manga, chapters, autoStart)
     }
 
     /**
@@ -94,7 +100,7 @@ class DownloadManager(context: Context) {
      * @return an observable containing the list of pages from the chapter.
      */
     fun buildPageList(source: Source, manga: Manga, chapter: Chapter): Observable<List<Page>> {
-        return buildPageList(provider.findChapterDir(source, manga, chapter))
+        return buildPageList(provider.findChapterDir(chapter, manga, source))
     }
 
     /**
@@ -120,61 +126,45 @@ class DownloadManager(context: Context) {
     }
 
     /**
-     * Returns the directory name for a manga.
+     * Returns true if the chapter is downloaded.
      *
-     * @param manga the manga to query.
+     * @param chapter the chapter to check.
-     */
-    fun getMangaDirName(manga: Manga): String {
-        return provider.getMangaDirName(manga)
-    }
-
-    /**
-     * Returns the directory name for the given chapter.
-     *
-     * @param chapter the chapter to query.
-     */
-    fun getChapterDirName(chapter: Chapter): String {
-        return provider.getChapterDirName(chapter)
-    }
-
-    /**
-     * Returns the download directory for a source if it exists.
-     *
-     * @param source the source to query.
-     */
-    fun findSourceDir(source: Source): UniFile? {
-        return provider.findSourceDir(source)
-    }
-
-    /**
-     * Returns the directory for the given manga, if it exists.
-     *
-     * @param source the source of the manga.
-     * @param manga the manga to query.
-     */
-    fun findMangaDir(source: Source, manga: Manga): UniFile? {
-        return provider.findMangaDir(source, manga)
-    }
-
-    /**
-     * Returns the directory for the given chapter, if it exists.
-     *
-     * @param source the source of the chapter.
      * @param manga the manga of the chapter.
-     * @param chapter the chapter to query.
+     * @param skipCache whether to skip the directory cache and check in the filesystem.
      */
-    fun findChapterDir(source: Source, manga: Manga, chapter: Chapter): UniFile? {
+    fun isChapterDownloaded(chapter: Chapter, manga: Manga, skipCache: Boolean = false): Boolean {
-        return provider.findChapterDir(source, manga, chapter)
+        return cache.isChapterDownloaded(chapter, manga, skipCache)
+    }
+
+    /**
+     * Returns the amount of downloaded chapters for a manga.
+     *
+     * @param manga the manga to check.
+     */
+    fun getDownloadCount(manga: Manga): Int {
+        return cache.getDownloadCount(manga)
     }
 
     /**
      * Deletes the directory of a downloaded chapter.
      *
-     * @param source the source of the chapter.
-     * @param manga the manga of the chapter.
      * @param chapter the chapter to delete.
+     * @param manga the manga of the chapter.
+     * @param source the source of the chapter.
      */
-    fun deleteChapter(source: Source, manga: Manga, chapter: Chapter) {
+    fun deleteChapter(chapter: Chapter, manga: Manga, source: Source) {
-        provider.findChapterDir(source, manga, chapter)?.delete()
+        provider.findChapterDir(chapter, manga, source)?.delete()
+        cache.removeChapter(chapter, manga)
+    }
+
+    /**
+     * Deletes the directory of a downloaded manga.
+     *
+     * @param manga the manga to delete.
+     * @param source the source of the manga.
+     */
+    fun deleteManga(manga: Manga, source: Source) {
+        provider.findMangaDir(manga, source)?.delete()
+        cache.removeManga(manga)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt

@@ -3,12 +3,12 @@ package eu.kanade.tachiyomi.data.download
 import android.content.Context
 import android.graphics.BitmapFactory
 import android.support.v4.app.NotificationCompat
-import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.download.model.DownloadQueue
 import eu.kanade.tachiyomi.data.notification.NotificationHandler
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.chop
 import eu.kanade.tachiyomi.util.notificationManager
 import java.util.regex.Pattern
@@ -23,7 +23,7 @@ internal class DownloadNotifier(private val context: Context) {
      * Notification builder.
      */
     private val notification by lazy {
-        NotificationCompat.Builder(context)
+        NotificationCompat.Builder(context, Notifications.CHANNEL_DOWNLOADER)
                 .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.mipmap.ic_launcher))
     }
 
@@ -69,7 +69,7 @@ internal class DownloadNotifier(private val context: Context) {
      *
      * @param id the id of the notification.
      */
-    private fun NotificationCompat.Builder.show(id: Int = Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ID) {
+    private fun NotificationCompat.Builder.show(id: Int = Notifications.ID_DOWNLOAD_CHAPTER) {
         context.notificationManager.notify(id, build())
     }
 
@@ -86,7 +86,7 @@ internal class DownloadNotifier(private val context: Context) {
      * those can only be dismissed by the user.
      */
     fun dismiss() {
-        context.notificationManager.cancel(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ID)
+        context.notificationManager.cancel(Notifications.ID_DOWNLOAD_CHAPTER)
     }
 
     /**
@@ -262,7 +262,7 @@ internal class DownloadNotifier(private val context: Context) {
             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
             setProgress(0, 0, false)
         }
-        notification.show(Constants.NOTIFICATION_DOWNLOAD_CHAPTER_ERROR_ID)
+        notification.show(Notifications.ID_DOWNLOAD_CHAPTER_ERROR)
 
         // Reset download information
         errorThrown = true

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt

@@ -40,10 +40,10 @@ class DownloadProvider(private val context: Context) {
     /**
      * Returns the download directory for a manga. For internal use only.
      *
-     * @param source the source of the manga.
      * @param manga the manga to query.
+     * @param source the source of the manga.
      */
-    internal fun getMangaDir(source: Source, manga: Manga): UniFile {
+    internal fun getMangaDir(manga: Manga, source: Source): UniFile {
         return downloadsDir
                 .createDirectory(getSourceDirName(source))
                 .createDirectory(getMangaDirName(manga))
@@ -61,10 +61,10 @@ class DownloadProvider(private val context: Context) {
     /**
      * Returns the download directory for a manga if it exists.
      *
-     * @param source the source of the manga.
      * @param manga the manga to query.
+     * @param source the source of the manga.
      */
-    fun findMangaDir(source: Source, manga: Manga): UniFile? {
+    fun findMangaDir(manga: Manga, source: Source): UniFile? {
         val sourceDir = findSourceDir(source)
         return sourceDir?.findFile(getMangaDirName(manga))
     }
@@ -72,12 +72,12 @@ class DownloadProvider(private val context: Context) {
     /**
      * Returns the download directory for a chapter if it exists.
      *
-     * @param source the source of the chapter.
-     * @param manga the manga of the chapter.
      * @param chapter the chapter to query.
+     * @param manga the manga of the chapter.
+     * @param source the source of the chapter.
      */
-    fun findChapterDir(source: Source, manga: Manga, chapter: Chapter): UniFile? {
+    fun findChapterDir(chapter: Chapter, manga: Manga, source: Source): UniFile? {
-        val mangaDir = findMangaDir(source, manga)
+        val mangaDir = findMangaDir(manga, source)
         return mangaDir?.findFile(getChapterDirName(chapter))
     }
 

app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadService.kt

@@ -122,7 +122,7 @@ class DownloadService : Service() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ state -> onNetworkStateChanged(state)
-                }, { error ->
+                }, { _ ->
                     toast(R.string.download_queue_error)
                     stopSelf()
                 })

app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt

@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList
 import eu.kanade.tachiyomi.util.*
+import kotlinx.coroutines.experimental.async
 import okhttp3.Response
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
@@ -36,8 +37,11 @@ import uy.kohesive.injekt.injectLazy
  *
  * @param context the application context.
  * @param provider the downloads directory provider.
+ * @param cache the downloads cache, used to add the downloads to the cache after their completion.
  */
-class Downloader(private val context: Context, private val provider: DownloadProvider) {
+class Downloader(private val context: Context,
+                 private val provider: DownloadProvider,
+                 private val cache: DownloadCache) {
 
     /**
      * Store for persisting downloads across restarts.
@@ -90,12 +94,10 @@ class Downloader(private val context: Context, private val provider: DownloadPro
     @Volatile private var isRunning: Boolean = false
 
     init {
-        Observable.fromCallable { store.restore() }
+        launchNow {
-                .map { downloads -> downloads.filter { isDownloadAllowed(it) } }
+            val chapters = async { store.restore() }
-                .subscribeOn(Schedulers.io())
+            queue.addAll(chapters.await())
-                .observeOn(AndroidSchedulers.mainThread())
+        }
-                .subscribe({ downloads -> queue.addAll(downloads)
-                }, { error -> Timber.e(error) })
     }
 
     /**
@@ -213,61 +215,57 @@ class Downloader(private val context: Context, private val provider: DownloadPro
     }
 
     /**
-     * Creates a download object for every chapter and adds them to the downloads queue. This method
+     * Creates a download object for every chapter and adds them to the downloads queue.
-     * must be called in the main thread.
      *
      * @param manga the manga of the chapters to download.
      * @param chapters the list of chapters to download.
+     * @param autoStart whether to start the downloader after enqueing the chapters.
      */
-    fun queueChapters(manga: Manga, chapters: List<Chapter>) {
+    fun queueChapters(manga: Manga, chapters: List<Chapter>, autoStart: Boolean) = launchUI {
-        val source = sourceManager.get(manga.source) as? HttpSource ?: return
+        val source = sourceManager.get(manga.source) as? HttpSource ?: return@launchUI
 
-        val chaptersToQueue = chapters
+        // Called in background thread, the operation can be slow with SAF.
-                // Avoid downloading chapters with the same name.
+        val chaptersWithoutDir = async {
-                .distinctBy { it.name }
+            val mangaDir = provider.findMangaDir(manga, source)
-                // Add chapters to queue from the start.
-                .sortedByDescending { it.source_order }
-                // Create a downloader for each one.
-                .map { Download(source, manga, it) }
-                // Filter out those already queued or downloaded.
-                .filter { isDownloadAllowed(it) }
 
-        // Return if there's nothing to queue.
+            chapters
-        if (chaptersToQueue.isEmpty())
+                    // Avoid downloading chapters with the same name.
-            return
+                    .distinctBy { it.name }
-
+                    // Filter out those already downloaded.
-        queue.addAll(chaptersToQueue)
+                    .filter { mangaDir?.findFile(provider.getChapterDirName(it)) == null }
-
+                    // Add chapters to queue from the start.
-        // Initialize queue size.
+                    .sortedByDescending { it.source_order }
-        notifier.initialQueueSize = queue.size
-
-        // Initial multi-thread
-        notifier.multipleDownloadThreads = preferences.downloadThreads().getOrDefault() > 1
-
-        if (isRunning) {
-            // Send the list of downloads to the downloader.
-            downloadsRelay.call(chaptersToQueue)
-        } else {
-            // Show initial notification.
-            notifier.onProgressChange(queue)
         }
-    }
 
-    /**
+        // Runs in main thread (synchronization needed).
-     * Returns true if the given download can be queued and downloaded.
+        val chaptersToQueue = chaptersWithoutDir.await()
-     *
+                // Filter out those already enqueued.
-     * @param download the download to be checked.
+                .filter { chapter -> queue.none { it.chapter.id == chapter.id } }
-     */
+                // Create a download for each one.
-    private fun isDownloadAllowed(download: Download): Boolean {
+                .map { Download(source, manga, it) }
-        // If the chapter is already queued, don't add it again
-        if (queue.any { it.chapter.id == download.chapter.id })
-            return false
 
-        val dir = provider.findChapterDir(download.source, download.manga, download.chapter)
+        if (chaptersToQueue.isNotEmpty()) {
-        if (dir != null && dir.exists())
+            queue.addAll(chaptersToQueue)
-            return false
 
-        return true
+            // Initialize queue size.
+            notifier.initialQueueSize = queue.size
+
+            // Initial multi-thread
+            notifier.multipleDownloadThreads = preferences.downloadThreads().getOrDefault() > 1
+
+            if (isRunning) {
+                // Send the list of downloads to the downloader.
+                downloadsRelay.call(chaptersToQueue)
+            } else {
+                // Show initial notification.
+                notifier.onProgressChange(queue)
+            }
+
+            // Start downloader if needed
+            if (autoStart) {
+                DownloadService.start(this@Downloader.context)
+            }
+        }
     }
 
     /**
@@ -277,7 +275,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
      */
     private fun downloadChapter(download: Download): Observable<Download> {
         val chapterDirname = provider.getChapterDirName(download.chapter)
-        val mangaDir = provider.getMangaDir(download.source, download.manga)
+        val mangaDir = provider.getMangaDir(download.manga, download.source)
         val tmpDir = mangaDir.createDirectory("${chapterDirname}_tmp")
 
         val pageListObservable = if (download.pages == null) {
@@ -295,7 +293,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
         }
 
         return pageListObservable
-                .doOnNext { pages ->
+                .doOnNext { _ ->
                     // Delete all temporary (unfinished) files
                     tmpDir.listFiles()
                             ?.filter { it.name!!.endsWith(".tmp") }
@@ -311,9 +309,9 @@ class Downloader(private val context: Context, private val provider: DownloadPro
                 // Do when page is downloaded.
                 .doOnNext { notifier.onProgressChange(download, queue) }
                 .toList()
-                .map { pages -> download }
+                .map { _ -> download }
                 // Do after download completes
-                .doOnNext { ensureSuccessfulDownload(download, tmpDir, chapterDirname) }
+                .doOnNext { ensureSuccessfulDownload(download, mangaDir, tmpDir, chapterDirname) }
                 // If the page list threw, it will resume here
                 .onErrorReturn { error ->
                     download.status = Download.ERROR
@@ -419,10 +417,13 @@ class Downloader(private val context: Context, private val provider: DownloadPro
      * Checks if the download was successful.
      *
      * @param download the download to check.
+     * @param mangaDir the manga directory of the download.
      * @param tmpDir the directory where the download is currently stored.
      * @param dirname the real (non temporary) directory name of the download.
      */
-    private fun ensureSuccessfulDownload(download: Download, tmpDir: UniFile, dirname: String) {
+    private fun ensureSuccessfulDownload(download: Download, mangaDir: UniFile,
+                                         tmpDir: UniFile, dirname: String) {
+
         // Ensure that the chapter folder has all the images.
         val downloadedImages = tmpDir.listFiles().orEmpty().filterNot { it.name!!.endsWith(".tmp") }
 
@@ -435,6 +436,7 @@ class Downloader(private val context: Context, private val provider: DownloadPro
         // Only rename the directory if it's downloaded.
         if (download.status == Download.DOWNLOADED) {
             tmpDir.renameTo(dirname)
+            cache.addChapter(dirname, mangaDir, download.manga)
         }
     }
 

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

@@ -66,6 +66,7 @@ class DownloadQueue(
                         val pageStatusSubject = PublishSubject.create<Int>()
                         setPagesSubject(download.pages, pageStatusSubject)
                         return@flatMap pageStatusSubject
+                                .onBackpressureBuffer()
                                 .filter { it == Page.READY }
                                 .map { download }
 

app/src/main/java/eu/kanade/tachiyomi/data/glide/FileFetcher.kt

@@ -1,35 +1,51 @@
-package eu.kanade.tachiyomi.data.glide
+package eu.kanade.tachiyomi.data.glide
-
+
-import com.bumptech.glide.Priority
+import android.content.ContentValues.TAG
-import com.bumptech.glide.load.data.DataFetcher
+import android.util.Log
-import java.io.File
+import com.bumptech.glide.Priority
-import java.io.IOException
+import com.bumptech.glide.load.DataSource
-import java.io.InputStream
+import com.bumptech.glide.load.data.DataFetcher
-
+import java.io.*
-open class FileFetcher(private val file: File) : DataFetcher<InputStream> {
+
-
+open class FileFetcher(private val file: File) : DataFetcher<InputStream> {
-    private var data: InputStream? = null
+
-
+    private var data: InputStream? = null
-    override fun loadData(priority: Priority): InputStream {
+
-        data = file.inputStream()
+    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        return data!!
+        loadFromFile(callback)
-    }
+    }
-
+
-    override fun cleanup() {
+    protected fun loadFromFile(callback: DataFetcher.DataCallback<in InputStream>) {
-        data?.let { data ->
+        try {
-            try {
+            data = FileInputStream(file)
-                data.close()
+        } catch (e: FileNotFoundException) {
-            } catch (e: IOException) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
-                // Ignore
+                Log.d(TAG, "Failed to open file", e)
-            }
+            }
-        }
+            callback.onLoadFailed(e)
-    }
+            return
-
+        }
-    override fun cancel() {
+
-        // Do nothing.
+        callback.onDataReady(data)
-    }
+    }
-
+
-    override fun getId(): String {
+    override fun cleanup() {
-        return file.toString()
+        try {
-    }
+            data?.close()
+        } catch (e: IOException) {
+            // Ignored.
+        }
+    }
+
+    override fun cancel() {
+        // Do nothing.
+    }
+
+    override fun getDataClass(): Class<InputStream> {
+        return InputStream::class.java
+    }
+
+    override fun getDataSource(): DataSource {
+        return DataSource.LOCAL
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/data/glide/LibraryMangaUrlFetcher.kt

@@ -0,0 +1,72 @@
+package eu.kanade.tachiyomi.data.glide
+
+import com.bumptech.glide.Priority
+import com.bumptech.glide.load.data.DataFetcher
+import eu.kanade.tachiyomi.data.database.models.Manga
+import java.io.File
+import java.io.FileNotFoundException
+import java.io.InputStream
+
+/**
+ * A [DataFetcher] for loading a cover of a library manga.
+ * It tries to load the cover from our custom cache, and if it's not found, it fallbacks to network
+ * and copies the result to the cache.
+ *
+ * @param networkFetcher the network fetcher for this cover.
+ * @param manga the manga of the cover to load.
+ * @param file the file where this cover should be. It may exists or not.
+ */
+class LibraryMangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
+                             private val manga: Manga,
+                             private val file: File)
+: FileFetcher(file) {
+
+    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
+        if (!file.exists()) {
+            networkFetcher.loadData(priority, object : DataFetcher.DataCallback<InputStream> {
+                override fun onDataReady(data: InputStream?) {
+                    if (data != null) {
+                        val tmpFile = File(file.path + ".tmp")
+                        try {
+                            // Retrieve destination stream, create parent folders if needed.
+                            val output = try {
+                                tmpFile.outputStream()
+                            } catch (e: FileNotFoundException) {
+                                tmpFile.parentFile.mkdirs()
+                                tmpFile.outputStream()
+                            }
+
+                            // Copy the file and rename to the original.
+                            data.use { output.use { data.copyTo(output) } }
+                            tmpFile.renameTo(file)
+                            loadFromFile(callback)
+                        } catch (e: Exception) {
+                            tmpFile.delete()
+                            callback.onLoadFailed(e)
+                        }
+                    } else {
+                        callback.onLoadFailed(Exception("Null data"))
+                    }
+                }
+
+                override fun onLoadFailed(e: Exception) {
+                    callback.onLoadFailed(e)
+                }
+
+            })
+        } else {
+            loadFromFile(callback)
+        }
+    }
+
+    override fun cleanup() {
+        super.cleanup()
+        networkFetcher.cleanup()
+    }
+
+    override fun cancel() {
+        super.cancel()
+        networkFetcher.cancel()
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaFileFetcher.kt

@@ -1,18 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-
-open class MangaFileFetcher(private val file: File, private val manga: Manga) : FileFetcher(file) {
-
-    /**
-     * Returns the id for this manga's cover.
-     *
-     * Appending the file's modified date to the url, we can force Glide to skip its memory and disk
-     * lookup step and fetch from our custom cache. This allows us to invalidate Glide's cache when
-     * the file has changed. If the file doesn't exist it will append a 0.
-     */
-    override fun getId(): String {
-        return manga.thumbnail_url + file.lastModified()
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaModelLoader.kt

@@ -1,23 +1,24 @@
 package eu.kanade.tachiyomi.data.glide
 
-import android.content.Context
 import android.util.LruCache
-import com.bumptech.glide.Glide
 import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
-import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.model.*
-import com.bumptech.glide.load.model.stream.StreamModelLoader
 import eu.kanade.tachiyomi.data.cache.CoverCache
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.source.online.HttpSource
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
 import java.io.InputStream
 
+
 /**
  * A class for loading a cover associated with a [Manga] that can be present in our own cache.
- * Coupled with [MangaUrlFetcher], this class allows to implement the following flow:
+ * Coupled with [LibraryMangaUrlFetcher], this class allows to implement the following flow:
  *
  * - Check in RAM LRU.
  * - Check in disk LRU.
@@ -26,7 +27,7 @@ import java.io.InputStream
  *
  * @param context the application context.
  */
-class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
+class MangaModelLoader : ModelLoader<Manga, InputStream> {
 
     /**
      * Cover cache where persistent covers are stored.
@@ -39,16 +40,15 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
     private val sourceManager: SourceManager by injectLazy()
 
     /**
-     * Base network loader.
+     * Default network client.
      */
-    private val baseUrlLoader = Glide.buildModelLoader(GlideUrl::class.java,
+    private val defaultClient = Injekt.get<NetworkHelper>().client
-            InputStream::class.java, context)
 
     /**
      * LRU cache whose key is the thumbnail url of the manga, and the value contains the request url
      * and the file where it should be stored in case the manga is a favorite.
      */
-    private val lruCache = LruCache<String, Pair<GlideUrl, File>>(100)
+    private val lruCache = LruCache<GlideUrl, File>(100)
 
     /**
      * Map where request headers are stored for a source.
@@ -60,12 +60,17 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
      */
     class Factory : ModelLoaderFactory<Manga, InputStream> {
 
-        override fun build(context: Context, factories: GenericLoaderFactory)
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<Manga, InputStream> {
-                = MangaModelLoader(context)
+            return MangaModelLoader()
+        }
 
         override fun teardown() {}
     }
 
+    override fun handles(model: Manga): Boolean {
+        return true
+    }
+
     /**
      * Returns a fetcher for the given manga or null if the url is empty.
      *
@@ -73,10 +78,8 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
      * @param width the width of the view where the resource will be loaded.
      * @param height the height of the view where the resource will be loaded.
      */
-    override fun getResourceFetcher(manga: Manga,
+    override fun buildLoadData(manga: Manga, width: Int, height: Int,
-                                    width: Int,
+                               options: Options?): ModelLoader.LoadData<InputStream>? {
-                                    height: Int): DataFetcher<InputStream>? {
-
         // Check thumbnail is not null or empty
         val url = manga.thumbnail_url
         if (url == null || url.isEmpty()) {
@@ -85,26 +88,28 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
 
         if (url.startsWith("http")) {
             val source = sourceManager.get(manga.source) as? HttpSource
-
+            val glideUrl = GlideUrl(url, getHeaders(manga, source))
-            // Obtain the request url and the file for this url from the LRU cache, or calculate it
-            // and add them to the cache.
-            val (glideUrl, file) = lruCache.get(url) ?:
-                    Pair(GlideUrl(url, getHeaders(manga, source)), coverCache.getCoverFile(url)).apply {
-                        lruCache.put(url, this)
-                    }
 
             // Get the resource fetcher for this request url.
-            val networkFetcher = source?.let { OkHttpStreamFetcher(it.client, glideUrl) }
+            val networkFetcher = OkHttpStreamFetcher(source?.client ?: defaultClient, glideUrl)
-                ?: baseUrlLoader.getResourceFetcher(glideUrl, width, height)
+
+            if (!manga.favorite) {
+                return ModelLoader.LoadData(glideUrl, networkFetcher)
+            }
+
+            // Obtain the file for this url from the LRU cache, or retrieve and add it to the cache.
+            val file = lruCache.getOrPut(glideUrl) { coverCache.getCoverFile(url) }
+
+            val libraryFetcher = LibraryMangaUrlFetcher(networkFetcher, manga, file)
 
             // Return an instance of the fetcher providing the needed elements.
-            return MangaUrlFetcher(networkFetcher, file, manga)
+            return ModelLoader.LoadData(MangaSignature(manga, file), libraryFetcher)
         } else {
             // Get the file from the url, removing the scheme if present.
             val file = File(url.substringAfter("file://"))
 
             // Return an instance of the fetcher providing the needed elements.
-            return MangaFileFetcher(file, manga)
+            return ModelLoader.LoadData(MangaSignature(manga, file), FileFetcher(file))
         }
     }
 
@@ -127,4 +132,15 @@ class MangaModelLoader(context: Context) : StreamModelLoader<Manga> {
         }
     }
 
+    private inline fun <K, V> LruCache<K, V>.getOrPut(key: K, defaultValue: () -> V): V {
+        val value = get(key)
+        return if (value == null) {
+            val answer = defaultValue()
+            put(key, answer)
+            answer
+        } else {
+            value
+        }
+    }
+
 }

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaSignature.kt

@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.data.glide
+
+import com.bumptech.glide.load.Key
+import eu.kanade.tachiyomi.data.database.models.Manga
+import java.io.File
+import java.security.MessageDigest
+
+class MangaSignature(manga: Manga, file: File) : Key {
+
+    private val key = manga.thumbnail_url + file.lastModified()
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is MangaSignature) {
+            key == other.key
+        } else {
+            false
+        }
+    }
+
+    override fun hashCode(): Int {
+        return key.hashCode()
+    }
+
+    override fun updateDiskCacheKey(md: MessageDigest) {
+        md.update(key.toByteArray(Key.CHARSET))
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/glide/MangaUrlFetcher.kt

@@ -1,71 +0,0 @@
-package eu.kanade.tachiyomi.data.glide
-
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.data.DataFetcher
-import eu.kanade.tachiyomi.data.database.models.Manga
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.InputStream
-
-/**
- * A [DataFetcher] for loading a cover of a manga depending on its favorite status.
- * If the manga is favorite, it tries to load the cover from our cache, and if it's not found, it
- * fallbacks to network and copies it to the cache.
- * If the manga is not favorite, it tries to delete the cover from our cache and always fallback
- * to network for fetching.
- *
- * @param networkFetcher the network fetcher for this cover.
- * @param file the file where this cover should be. It may exists or not.
- * @param manga the manga of the cover to load.
- */
-class MangaUrlFetcher(private val networkFetcher: DataFetcher<InputStream>,
-                      private val file: File,
-                      private val manga: Manga)
-: MangaFileFetcher(file, manga) {
-
-    override fun loadData(priority: Priority): InputStream {
-        if (manga.favorite) {
-            synchronized(file) {
-                if (!file.exists()) {
-                    val tmpFile = File(file.path + ".tmp")
-                    try {
-                        // Retrieve source stream.
-                        val input = networkFetcher.loadData(priority)
-                                ?: throw Exception("Couldn't open source stream")
-
-                        // Retrieve destination stream, create parent folders if needed.
-                        val output = try {
-                            tmpFile.outputStream()
-                        } catch (e: FileNotFoundException) {
-                            tmpFile.parentFile.mkdirs()
-                            tmpFile.outputStream()
-                        }
-
-                        // Copy the file and rename to the original.
-                        input.use { output.use { input.copyTo(output) } }
-                        tmpFile.renameTo(file)
-                    } catch (e: Exception) {
-                        tmpFile.delete()
-                        throw e
-                    }
-                }
-            }
-            return super.loadData(priority)
-        } else {
-            if (file.exists()) {
-                file.delete()
-            }
-            return networkFetcher.loadData(priority)
-        }
-    }
-
-    override fun cancel() {
-        networkFetcher.cancel()
-    }
-
-    override fun cleanup() {
-        super.cleanup()
-        networkFetcher.cleanup()
-    }
-
-}

app/src/main/java/eu/kanade/tachiyomi/data/glide/TachiGlideModule.kt

@@ -1,12 +1,18 @@
 package eu.kanade.tachiyomi.data.glide
 
 import android.content.Context
+import android.graphics.drawable.Drawable
 import com.bumptech.glide.Glide
 import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
+import com.bumptech.glide.load.DecodeFormat
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
 import com.bumptech.glide.load.model.GlideUrl
-import com.bumptech.glide.module.GlideModule
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.bumptech.glide.module.AppGlideModule
+import com.bumptech.glide.request.RequestOptions
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.network.NetworkHelper
 import uy.kohesive.injekt.Injekt
@@ -16,17 +22,20 @@ import java.io.InputStream
 /**
  * Class used to update Glide module settings
  */
-class AppGlideModule : GlideModule {
+@GlideModule
+class TachiGlideModule : AppGlideModule() {
 
     override fun applyOptions(context: Context, builder: GlideBuilder) {
-        // Set the cache size of Glide to 15 MiB
+        builder.setDiskCache(InternalCacheDiskCacheFactory(context, 50 * 1024 * 1024))
-        builder.setDiskCache(InternalCacheDiskCacheFactory(context, 15 * 1024 * 1024))
+        builder.setDefaultRequestOptions(RequestOptions().format(DecodeFormat.PREFER_RGB_565))
+        builder.setDefaultTransitionOptions(Drawable::class.java,
+                DrawableTransitionOptions.withCrossFade())
     }
 
-    override fun registerComponents(context: Context, glide: Glide) {
+    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
         val networkFactory = OkHttpUrlLoader.Factory(Injekt.get<NetworkHelper>().client)
 
-        glide.register(GlideUrl::class.java, InputStream::class.java, networkFactory)
+        registry.replace(GlideUrl::class.java, InputStream::class.java, networkFactory)
-        glide.register(Manga::class.java, InputStream::class.java, MangaModelLoader.Factory())
+        registry.append(Manga::class.java, InputStream::class.java, MangaModelLoader.Factory())
     }
 }

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt

@@ -34,7 +34,6 @@ class LibraryUpdateJob : Job() {
                         .setRequiredNetworkType(wifiRestriction)
                         .setRequiresCharging(acRestriction)
                         .setRequirementsEnforced(true)
-                        .setPersisted(true)
                         .setUpdateCurrent(true)
                         .build()
                         .schedule()

app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt

@@ -10,16 +10,17 @@ import android.os.Build
 import android.os.IBinder
 import android.os.PowerManager
 import android.support.v4.app.NotificationCompat
-import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.data.database.models.Chapter
+import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.DownloadManager
 import eu.kanade.tachiyomi.data.download.DownloadService
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Companion.start
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.data.track.TrackManager
@@ -80,10 +81,12 @@ class LibraryUpdateService(
     /**
      * Cached progress notification to avoid creating a lot.
      */
-    private val progressNotification by lazy { NotificationCompat.Builder(this)
+    private val progressNotification by lazy { NotificationCompat.Builder(this, Notifications.CHANNEL_LIBRARY)
+            .setContentTitle(getString(R.string.app_name))
             .setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
             .setLargeIcon(notificationBitmap)
             .setOngoing(true)
+            .setOnlyAlertOnce(true)
             .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
     }
 
@@ -132,7 +135,11 @@ class LibraryUpdateService(
                     putExtra(KEY_TARGET, target)
                     category?.let { putExtra(KEY_CATEGORY, it.id) }
                 }
-                context.startService(intent)
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                    context.startService(intent)
+                } else {
+                    context.startForegroundService(intent)
+                }
             }
         }
 
@@ -153,6 +160,7 @@ class LibraryUpdateService(
      */
     override fun onCreate() {
         super.onCreate()
+        startForeground(Notifications.ID_LIBRARY_PROGRESS, progressNotification.build())
         wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).newWakeLock(
                 PowerManager.PARTIAL_WAKE_LOCK, "LibraryUpdateService:WakeLock")
         wakeLock.acquire()
@@ -224,7 +232,7 @@ class LibraryUpdateService(
      * @param target the target to update.
      * @return a list of manga to update
      */
-    fun getMangaToUpdate(intent: Intent, target: Target): List<Manga> {
+    fun getMangaToUpdate(intent: Intent, target: Target): List<LibraryManga> {
         val categoryId = intent.getIntExtra(KEY_CATEGORY, -1)
 
         var listToUpdate = if (categoryId != -1)
@@ -255,7 +263,7 @@ class LibraryUpdateService(
      * @param mangaToUpdate the list to update
      * @return an observable delivering the progress of each update.
      */
-    fun updateChapterList(mangaToUpdate: List<Manga>): Observable<Manga> {
+    fun updateChapterList(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         val count = AtomicInteger(0)
         // List containing new updates
@@ -279,7 +287,7 @@ class LibraryUpdateService(
                             // If there's any error, return empty update and continue.
                             .onErrorReturn {
                                 failedUpdates.add(manga)
-                                Pair(emptyList<Chapter>(), emptyList<Chapter>())
+                                Pair(emptyList(), emptyList())
                             }
                             // Filter out mangas without new chapters (or failed).
                             .filter { pair -> pair.first.isNotEmpty() }
@@ -325,7 +333,9 @@ class LibraryUpdateService(
         val dbChapters = chapters.map {
             mangaChapters.find { mangaChapter -> mangaChapter.url == it.url }!!
         }
-        downloadManager.downloadChapters(manga, dbChapters)
+        // We don't want to start downloading while the library is updating, because websites
+        // may don't like it and they could ban the user.
+        downloadManager.downloadChapters(manga, dbChapters, false)
     }
 
     /**
@@ -347,7 +357,7 @@ class LibraryUpdateService(
      * @param mangaToUpdate the list to update
      * @return an observable delivering the progress of each update.
      */
-    fun updateDetails(mangaToUpdate: List<Manga>): Observable<Manga> {
+    fun updateDetails(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         val count = AtomicInteger(0)
 
@@ -358,7 +368,7 @@ class LibraryUpdateService(
                 // Update the details of the manga.
                 .concatMap { manga ->
                     val source = sourceManager.get(manga.source) as? HttpSource
-                            ?: return@concatMap Observable.empty<Manga>()
+                            ?: return@concatMap Observable.empty<LibraryManga>()
 
                     source.fetchMangaDetails(manga)
                             .map { networkManga ->
@@ -377,7 +387,7 @@ class LibraryUpdateService(
      * Method that updates the metadata of the connected tracking services. It's called in a
      * background thread, so it's safe to do heavy operations or network calls here.
      */
-    private fun updateTrackings(mangaToUpdate: List<Manga>): Observable<Manga> {
+    private fun updateTrackings(mangaToUpdate: List<LibraryManga>): Observable<LibraryManga> {
         // Initialize the variables holding the progress of the updates.
         var count = 0
 
@@ -417,7 +427,7 @@ class LibraryUpdateService(
      * @param total the total progress.
      */
     private fun showProgressNotification(manga: Manga, current: Int, total: Int) {
-        notificationManager.notify(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID, progressNotification
+        notificationManager.notify(Notifications.ID_LIBRARY_PROGRESS, progressNotification
                 .setContentTitle(manga.title)
                 .setProgress(total, current, false)
                 .build())
@@ -434,7 +444,7 @@ class LibraryUpdateService(
         // Append new chapters from a previous, existing notification
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             val previousNotification = notificationManager.activeNotifications
-                    .find { it.id == Constants.NOTIFICATION_LIBRARY_RESULT_ID }
+                    .find { it.id == Notifications.ID_LIBRARY_RESULT }
 
             if (previousNotification != null) {
                 val oldUpdates = previousNotification.notification.extras
@@ -446,7 +456,7 @@ class LibraryUpdateService(
             }
         }
 
-        notificationManager.notify(Constants.NOTIFICATION_LIBRARY_RESULT_ID, notification {
+        notificationManager.notify(Notifications.ID_LIBRARY_RESULT, notification(Notifications.CHANNEL_LIBRARY) {
             setSmallIcon(R.drawable.ic_book_white_24dp)
             setLargeIcon(notificationBitmap)
             setContentTitle(getString(R.string.notification_new_chapters))
@@ -466,7 +476,7 @@ class LibraryUpdateService(
      * Cancels the progress notification.
      */
     private fun cancelProgressNotification() {
-        notificationManager.cancel(Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
+        notificationManager.cancel(Notifications.ID_LIBRARY_PROGRESS)
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt

@@ -5,7 +5,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Chapter
@@ -41,6 +40,8 @@ class NotificationReceiver : BroadcastReceiver() {
             ACTION_RESUME_DOWNLOADS -> DownloadService.start(context)
             // Clear the download queue
             ACTION_CLEAR_DOWNLOADS -> downloadManager.clearQueue(true)
+            // Show message notification created
+            ACTION_SHORTCUT_CREATED -> context.toast(R.string.shortcut_created)
             // Launch share activity and dismiss notification
             ACTION_SHARE_IMAGE -> shareImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION),
                     intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
@@ -48,7 +49,7 @@ class NotificationReceiver : BroadcastReceiver() {
             ACTION_DELETE_IMAGE -> deleteImage(context, intent.getStringExtra(EXTRA_FILE_LOCATION),
                     intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1))
             // Cancel library update and dismiss notification
-            ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Constants.NOTIFICATION_LIBRARY_PROGRESS_ID)
+            ACTION_CANCEL_LIBRARY_UPDATE -> cancelLibraryUpdate(context, Notifications.ID_LIBRARY_PROGRESS)
             // Open reader activity
             ACTION_OPEN_CHAPTER -> {
                 openChapter(context, intent.getLongExtra(EXTRA_MANGA_ID, -1),
@@ -161,6 +162,9 @@ class NotificationReceiver : BroadcastReceiver() {
         // Called to clear downloads.
         private const val ACTION_CLEAR_DOWNLOADS = "$ID.$NAME.ACTION_CLEAR_DOWNLOADS"
 
+        // Called to notify user shortcut is created.
+        private const val ACTION_SHORTCUT_CREATED = "$ID.$NAME.ACTION_SHORTCUT_CREATED"
+
         // Called to dismiss notification.
         private const val ACTION_DISMISS_NOTIFICATION = "$ID.$NAME.ACTION_DISMISS_NOTIFICATION"
 
@@ -199,6 +203,13 @@ class NotificationReceiver : BroadcastReceiver() {
             return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
         }
 
+        internal fun shortcutCreatedBroadcast(context: Context) : PendingIntent {
+            val intent = Intent(context, NotificationReceiver::class.java).apply {
+                action = ACTION_SHORTCUT_CREATED
+            }
+            return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        }
+
         /**
          * Returns [PendingIntent] that starts a service which dismissed the notification
          *

app/src/main/java/eu/kanade/tachiyomi/data/notification/Notifications.kt

@@ -0,0 +1,54 @@
+package eu.kanade.tachiyomi.data.notification
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.notificationManager
+
+/**
+ * Class to manage the basic information of all the notifications used in the app.
+ */
+object Notifications {
+
+    /**
+     * Common notification channel and ids used anywhere.
+     */
+    const val CHANNEL_COMMON = "common_channel"
+    const val ID_UPDATER = 1
+    const val ID_DOWNLOAD_IMAGE = 2
+
+    /**
+     * Notification channel and ids used by the library updater.
+     */
+    const val CHANNEL_LIBRARY = "library_channel"
+    const val ID_LIBRARY_PROGRESS = 101
+    const val ID_LIBRARY_RESULT = 102
+
+    /**
+     * Notification channel and ids used by the downloader.
+     */
+    const val CHANNEL_DOWNLOADER = "downloader_channel"
+    const val ID_DOWNLOAD_CHAPTER = 201
+    const val ID_DOWNLOAD_CHAPTER_ERROR = 202
+
+    /**
+     * Creates the notification channels introduced in Android Oreo.
+     *
+     * @param context The application context.
+     */
+    fun createChannels(context: Context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+
+        val channels = listOf(
+                NotificationChannel(CHANNEL_COMMON, context.getString(R.string.channel_common),
+                        NotificationManager.IMPORTANCE_LOW),
+                NotificationChannel(CHANNEL_LIBRARY, context.getString(R.string.channel_library),
+                        NotificationManager.IMPORTANCE_LOW),
+                NotificationChannel(CHANNEL_DOWNLOADER, context.getString(R.string.channel_downloader),
+                        NotificationManager.IMPORTANCE_LOW)
+        )
+        context.notificationManager.createNotificationChannels(channels)
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -105,6 +105,8 @@ object PreferenceKeys {
 
     const val defaultCategory = "default_category"
 
+    const val downloadBadge = "display_download_badge"
+
     fun sourceUsername(sourceId: Long) = "pref_source_username_$sourceId"
 
     fun sourcePassword(sourceId: Long) = "pref_source_password_$sourceId"

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

@@ -141,6 +141,8 @@ class PreferencesHelper(val context: Context) {
 
     fun libraryAsList() = rxPrefs.getBoolean(Keys.libraryAsList, false)
 
+    fun downloadBadge() = rxPrefs.getBoolean(Keys.downloadBadge, false)
+
     fun filterDownloaded() = rxPrefs.getBoolean(Keys.filterDownloaded, false)
 
     fun filterUnread() = rxPrefs.getBoolean(Keys.filterUnread, false)

app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateCheckerJob.kt

@@ -6,8 +6,8 @@ import android.support.v4.app.NotificationCompat
 import com.evernote.android.job.Job
 import com.evernote.android.job.JobManager
 import com.evernote.android.job.JobRequest
-import eu.kanade.tachiyomi.Constants.NOTIFICATION_UPDATER_ID
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.notificationManager
 
 class UpdateCheckerJob : Job() {
@@ -23,7 +23,7 @@ class UpdateCheckerJob : Job() {
                             putExtra(UpdateDownloaderService.EXTRA_DOWNLOAD_URL, url)
                         }
 
-                        NotificationCompat.Builder(context).update {
+                        NotificationCompat.Builder(context, Notifications.CHANNEL_COMMON).update {
                             setContentTitle(context.getString(R.string.app_name))
                             setContentText(context.getString(R.string.update_check_notification_update_available))
                             setSmallIcon(android.R.drawable.stat_sys_download_done)
@@ -43,7 +43,7 @@ class UpdateCheckerJob : Job() {
 
     fun NotificationCompat.Builder.update(block: NotificationCompat.Builder.() -> Unit) {
         block()
-        context.notificationManager.notify(NOTIFICATION_UPDATER_ID, build())
+        context.notificationManager.notify(Notifications.ID_UPDATER, build())
     }
 
     companion object {
@@ -54,7 +54,6 @@ class UpdateCheckerJob : Job() {
                     .setPeriodic(24 * 60 * 60 * 1000, 60 * 60 * 1000)
                     .setRequiredNetworkType(JobRequest.NetworkType.CONNECTED)
                     .setRequirementsEnforced(true)
-                    .setPersisted(true)
                     .setUpdateCurrent(true)
                     .build()
                     .schedule()

app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateDownloaderReceiver.kt

@@ -4,10 +4,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.support.v4.app.NotificationCompat
-import eu.kanade.tachiyomi.Constants
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.notification.NotificationHandler
 import eu.kanade.tachiyomi.data.notification.NotificationReceiver
+import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.util.notificationManager
 import java.io.File
 import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
@@ -49,7 +49,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
     /**
      * Notification shown to user
      */
-    private val notification = NotificationCompat.Builder(context)
+    private val notification = NotificationCompat.Builder(context, Notifications.CHANNEL_COMMON)
 
     override fun onReceive(context: Context, intent: Intent) {
         when (intent.getStringExtra(EXTRA_ACTION)) {
@@ -82,6 +82,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
     private fun updateProgress(progress: Int) {
         with(notification) {
             setProgress(100, progress, false)
+            setOnlyAlertOnce(true)
         }
         notification.show()
     }
@@ -96,6 +97,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
         with(notification) {
             setContentText(context.getString(R.string.update_check_notification_download_complete))
             setSmallIcon(android.R.drawable.stat_sys_download_done)
+            setOnlyAlertOnce(false)
             setProgress(0, 0, false)
             // Install action
             setContentIntent(NotificationHandler.installApkPendingActivity(context, File(path)))
@@ -105,7 +107,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
             // Cancel action
             addAction(R.drawable.ic_clear_grey_24dp_img,
                     context.getString(R.string.action_cancel),
-                    NotificationReceiver.dismissNotificationPendingBroadcast(context, Constants.NOTIFICATION_UPDATER_ID))
+                    NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER))
         }
         notification.show()
     }
@@ -120,6 +122,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
         with(notification) {
             setContentText(context.getString(R.string.update_check_notification_download_error))
             setSmallIcon(android.R.drawable.stat_sys_warning)
+            setOnlyAlertOnce(false)
             setProgress(0, 0, false)
             // Retry action
             addAction(R.drawable.ic_refresh_grey_24dp_img,
@@ -128,7 +131,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
             // Cancel action
             addAction(R.drawable.ic_clear_grey_24dp_img,
                     context.getString(R.string.action_cancel),
-                    NotificationReceiver.dismissNotificationPendingBroadcast(context, Constants.NOTIFICATION_UPDATER_ID))
+                    NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER))
         }
         notification.show()
     }
@@ -138,7 +141,7 @@ internal class UpdateDownloaderReceiver(val context: Context) : BroadcastReceive
      *
      * @param id the id of the notification.
      */
-    private fun NotificationCompat.Builder.show(id: Int = Constants.NOTIFICATION_UPDATER_ID) {
+    private fun NotificationCompat.Builder.show(id: Int = Notifications.ID_UPDATER) {
         context.notificationManager.notify(id, build())
     }
 }

app/src/main/java/eu/kanade/tachiyomi/network/PersistentCookieStore.kt

@@ -17,7 +17,7 @@ class PersistentCookieStore(context: Context) {
             val cookies = value as? Set<String>
             if (cookies != null) {
                 try {
-                    val url = HttpUrl.parse("http://$key")
+                    val url = HttpUrl.parse("http://$key") ?: continue
                     val nonExpiredCookies = cookies.mapNotNull { Cookie.parse(url, it) }
                             .filter { !it.hasExpired() }
                     cookieMap.put(key, nonExpiredCookies)

app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt

@@ -56,7 +56,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
     }
 
     override val id = ID
-    override val name = "LocalSource"
+    override val name = context.getString(R.string.local_source)
     override val lang = ""
     override val supportsLatest = true
 
@@ -76,13 +76,13 @@ class LocalSource(private val context: Context) : CatalogueSource {
         val state = ((if (filters.isEmpty()) POPULAR_FILTERS else filters)[0] as OrderBy).state
         when (state?.index) {
             0 -> {
-                if (state!!.ascending)
+                if (state.ascending)
                     mangaDirs = mangaDirs.sortedBy { it.name.toLowerCase(Locale.ENGLISH) }
                 else
                     mangaDirs = mangaDirs.sortedByDescending { it.name.toLowerCase(Locale.ENGLISH) }
             }
             1 -> {
-                if (state!!.ascending)
+                if (state.ascending)
                     mangaDirs = mangaDirs.sortedBy(File::lastModified)
                 else
                     mangaDirs = mangaDirs.sortedByDescending(File::lastModified)
@@ -144,7 +144,7 @@ class LocalSource(private val context: Context) : CatalogueSource {
                         } else {
                             chapterFile.nameWithoutExtension
                         }
-                        val chapNameCut = chapName.replace(manga.title, "", true).trim()
+                        val chapNameCut = chapName.replace(manga.title, "", true).trim(' ', '-', '_')
                         name = if (chapNameCut.isEmpty()) chapName else chapNameCut
                         date_upload = chapterFile.lastModified()
                         ChapterRecognition.parseChapterNumber(this, manga)

app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt

@@ -28,7 +28,11 @@ class Page(
     @Transient private var statusSubject: Subject<Int, Int>? = null
 
     override fun update(bytesRead: Long, contentLength: Long, done: Boolean) {
-        progress = (100 * bytesRead / contentLength).toInt()
+        progress = if (contentLength > 0) {
+            (100 * bytesRead / contentLength).toInt()
+        } else {
+            -1
+        }
     }
 
     fun setStatusSubject(subject: Subject<Int, Int>?) {

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

@@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.util.asJsoup
 import eu.kanade.tachiyomi.util.selectText
 import okhttp3.FormBody
 import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
@@ -48,6 +49,8 @@ class Batoto : ParsedHttpSource(), LoginSource {
 
     private val staffNotice = Pattern.compile("=+Batoto Staff Notice=+([^=]+)==+", Pattern.CASE_INSENSITIVE)
 
+    override val client: OkHttpClient = network.cloudflareClient
+
     override fun headersBuilder() = super.headersBuilder()
             .add("Cookie", "lang_option=English")
 

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

@@ -11,6 +11,7 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
+import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 
@@ -44,7 +45,33 @@ class Kissmanga : ParsedHttpSource() {
         val manga = SManga.create()
         element.select("td a:eq(0)").first().let {
             manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.text()
+            val title = it.text()
+            //check if cloudfire email obfuscation is affecting title name
+            if (title.contains("[email protected]", true)) {
+                try {
+                    var str: String = it.html()
+                    //get the  number
+                    str = str.substringAfter("data-cfemail=\"")
+                    str = str.substringBefore("\">[email")
+                    val sb = StringBuilder()
+                    //convert number to char
+                    val r = Integer.valueOf(str.substring(0, 2), 16)!!
+                    var i = 2
+                    while (i < str.length) {
+                        val c = (Integer.valueOf(str.substring(i, i + 2), 16) xor r).toChar()
+                        sb.append(c)
+                        i += 2
+                    }
+                    //replace the new word into the title
+                    manga.title = title.replace("[email protected]", sb.toString(), true)
+                } catch (e: Exception) {
+                    //on error just default to obfuscated title
+                    Timber.e("error parsing [email protected]", e)
+                    manga.title = title
+                }
+            } else {
+                manga.title = title
+            }
         }
         return manga
     }
@@ -199,6 +226,7 @@ class Kissmanga : ParsedHttpSource() {
             Genre("Mystery"),
             Genre("One shot"),
             Genre("Psychological"),
+            Genre("Reincarnation"),
             Genre("Romance"),
             Genre("School Life"),
             Genre("Sci-fi"),
@@ -212,7 +240,9 @@ class Kissmanga : ParsedHttpSource() {
             Genre("Smut"),
             Genre("Sports"),
             Genre("Supernatural"),
+            Genre("Time Travel"),
             Genre("Tragedy"),
+            Genre("Transported"),
             Genre("Webtoon"),
             Genre("Yaoi"),
             Genre("Yuri")

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangafox.kt

@@ -89,13 +89,20 @@ class Mangafox : ParsedHttpSource() {
         val infoElement = document.select("div#title").first()
         val rowElement = infoElement.select("table > tbody > tr:eq(1)").first()
         val sideInfoElement = document.select("#series_info").first()
+        val licensedElement = document.select("div.warning").first()
 
         val manga = SManga.create()
         manga.author = rowElement.select("td:eq(1)").first()?.text()
         manga.artist = rowElement.select("td:eq(2)").first()?.text()
         manga.genre = rowElement.select("td:eq(3)").first()?.text()
         manga.description = infoElement.select("p.summary").first()?.text()
-        manga.status = sideInfoElement.select(".data").first()?.text().orEmpty().let { parseStatus(it) }
+        val isLicensed = licensedElement?.text()?.contains("licensed")
+        if (isLicensed == true) {
+            manga.status = SManga.LICENSED
+        } else {
+            manga.status = sideInfoElement.select(".data").first()?.text().orEmpty().let { parseStatus(it) }
+        }
+
         manga.thumbnail_url = sideInfoElement.select("div.cover > img").first()?.attr("src")
         return manga
     }

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Mangahere.kt

@@ -7,9 +7,13 @@ import okhttp3.HttpUrl
 import okhttp3.Request
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
+import javax.net.ssl.SSLContext
+import javax.net.ssl.X509TrustManager
 
 class Mangahere : ParsedHttpSource() {
 
@@ -23,6 +27,26 @@ class Mangahere : ParsedHttpSource() {
 
     override val supportsLatest = true
 
+    private val trustManager = object : X509TrustManager {
+        override fun getAcceptedIssuers(): Array<X509Certificate> {
+            return emptyArray()
+        }
+
+        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+
+        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+    }
+
+    private val sslContext = SSLContext.getInstance("SSL").apply {
+        init(null, arrayOf(trustManager), SecureRandom())
+    }
+
+    override val client = super.client.newBuilder()
+            .sslSocketFactory(sslContext.socketFactory, trustManager)
+            .build()
+
     override fun popularMangaSelector() = "div.directory_list > ul > li"
 
     override fun latestUpdatesSelector() = "div.directory_list > ul > li"
@@ -87,8 +111,8 @@ class Mangahere : ParsedHttpSource() {
         val infoElement = detailElement.select(".detail_topText").first()
 
         val manga = SManga.create()
-        manga.author = infoElement.select("a[href^=http://www.mangahere.co/author/]").first()?.text()
+        manga.author = infoElement.select("a[href^=//www.mangahere.co/author/]").first()?.text()
-        manga.artist = infoElement.select("a[href^=http://www.mangahere.co/artist/]").first()?.text()
+        manga.artist = infoElement.select("a[href^=//www.mangahere.co/artist/]").first()?.text()
         manga.genre = infoElement.select("li:eq(3)").first()?.text()?.substringAfter("Genre(s):")
         manga.description = infoElement.select("#show").first()?.text()?.substringBeforeLast("Show less")
         manga.status = infoElement.select("li:eq(6)").first()?.text().orEmpty().let { parseStatus(it) }
@@ -159,7 +183,9 @@ class Mangahere : ParsedHttpSource() {
 
         val pages = mutableListOf<Page>()
         document.select("select.wid60").first()?.getElementsByTag("option")?.forEach {
-            pages.add(Page(pages.size, it.attr("value")))
+            if (!it.attr("value").contains("featured.html")) {
+                pages.add(Page(pages.size, "http:" + it.attr("value")))
+            }
         }
         pages.getOrNull(0)?.imageUrl = imageUrlParse(document)
         return pages
@@ -174,6 +200,7 @@ class Mangahere : ParsedHttpSource() {
     private class OrderBy : Filter.Sort("Order by",
             arrayOf("Series name", "Rating", "Views", "Total chapters", "Last chapter"),
             Filter.Sort.Selection(2, false))
+
     private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
 
     override fun getFilterList() = FilterList(

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Readmangatoday.kt

@@ -17,7 +17,7 @@ class Readmangatoday : ParsedHttpSource() {
 
     override val name = "ReadMangaToday"
 
-    override val baseUrl = "http://www.readmanga.today"
+    override val baseUrl = "http://www.readmng.com/"
 
     override val lang = "en"
 
@@ -161,7 +161,7 @@ class Readmangatoday : ParsedHttpSource() {
         return pages
     }
 
-    override fun imageUrlParse(document: Document) = document.select("img.img-responsive-2").first().attr("src")
+    override fun imageUrlParse(document: Document) = document.select("#chapter_img").first().attr("src")
 
     private class Status : Filter.TriState("Completed")
     private class Genre(name: String, val id: Int) : Filter.TriState(name)

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mangachan.kt

@@ -23,9 +23,8 @@ class Mangachan : ParsedHttpSource() {
 
     override val supportsLatest = true
 
-    override fun popularMangaRequest(page: Int): Request {
+    override fun popularMangaRequest(page: Int): Request =
-        return GET("$baseUrl/mostfavorites?offset=${20 * (page - 1)}", headers)
+            GET("$baseUrl/mostfavorites?offset=${20 * (page - 1)}", headers)
-    }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         var pageNum = 1
@@ -48,9 +47,7 @@ class Mangachan : ParsedHttpSource() {
         return GET(url, headers)
     }
 
-    override fun latestUpdatesRequest(page: Int): Request {
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/newestch?page=$page")
-        return GET("$baseUrl/newestch?page=$page")
-    }
 
     override fun popularMangaSelector() = "div.content_row"
 
@@ -76,9 +73,7 @@ class Mangachan : ParsedHttpSource() {
         return manga
     }
 
-    override fun searchMangaFromElement(element: Element): SManga {
+    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-        return popularMangaFromElement(element)
-    }
 
     override fun popularMangaNextPageSelector() = "a:contains(Вперед)"
 
@@ -125,16 +120,14 @@ class Mangachan : ParsedHttpSource() {
         manga.genre = infoElement.select("tr:eq(5) > td:eq(1)").text()
         manga.status = parseStatus(infoElement.select("tr:eq(4) > td:eq(1)").text())
         manga.description = descElement.textNodes().first().text()
-        manga.thumbnail_url = baseUrl + imgElement.attr("src")
+        manga.thumbnail_url = imgElement.attr("src")
         return manga
     }
 
-    private fun parseStatus(element: String): Int {
+    private fun parseStatus(element: String): Int = when {
-        when {
+        element.contains("перевод завершен") -> SManga.COMPLETED
-            element.contains("перевод завершен") -> return SManga.COMPLETED
+        element.contains("перевод продолжается") -> SManga.ONGOING
-            element.contains("перевод продолжается") -> return SManga.ONGOING
+        else -> SManga.UNKNOWN
-            else -> return SManga.UNKNOWN
-        }
     }
 
     override fun chapterListSelector() = "table.table_cha tr:gt(1)"

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Mintmanga.kt

@@ -23,13 +23,11 @@ class Mintmanga : ParsedHttpSource() {
 
     override val supportsLatest = true
 
-    override fun popularMangaRequest(page: Int): Request {
+    override fun popularMangaRequest(page: Int): Request =
-        return GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
+            GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
-    }
 
-    override fun latestUpdatesRequest(page: Int): Request {
+    override fun latestUpdatesRequest(page: Int): Request =
-        return GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
+            GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
-    }
 
     override fun popularMangaSelector() = "div.desc"
 
@@ -44,24 +42,21 @@ class Mintmanga : ParsedHttpSource() {
         return manga
     }
 
-    override fun latestUpdatesFromElement(element: Element): SManga {
+    override fun latestUpdatesFromElement(element: Element): SManga =
-        return popularMangaFromElement(element)
+            popularMangaFromElement(element)
-    }
 
     override fun popularMangaNextPageSelector() = "a.nextLink"
 
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val genres = filters.filterIsInstance<Genre>().map { it.id + arrayOf("=", "=in", "=ex")[it.state] }.joinToString("&")
+        val genres = filters.filterIsInstance<Genre>().joinToString("&") { it.id + arrayOf("=", "=in", "=ex")[it.state] }
-        return GET("$baseUrl/search?q=$query&$genres", headers)
+        return GET("$baseUrl/search/advanced?q=$query&$genres", headers)
     }
 
     override fun searchMangaSelector() = popularMangaSelector()
 
-    override fun searchMangaFromElement(element: Element): SManga {
+    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-        return popularMangaFromElement(element)
-    }
 
     // max 200 results
     override fun searchMangaNextPageSelector() = null
@@ -78,13 +73,11 @@ class Mintmanga : ParsedHttpSource() {
         return manga
     }
 
-    private fun parseStatus(element: String): Int {
+    private fun parseStatus(element: String): Int = when {
-        when {
+        element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
-            element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> return SManga.LICENSED
+        element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
-            element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> return SManga.COMPLETED
+        element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
-            element.contains("<b>Перевод:</b> продолжается") -> return SManga.ONGOING
+        else -> SManga.UNKNOWN
-            else -> return SManga.UNKNOWN
-        }
     }
 
     override fun chapterListSelector() = "div.chapters-link tbody tr"
@@ -149,7 +142,7 @@ class Mintmanga : ParsedHttpSource() {
     /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")].map((el,i) => {
     *  const onClick=el.getAttribute('onclick');const id=onClick.substr(31,onClick.length-33);
     *  return `Genre("${el.textContent.trim()}", "${id}")` }).join(',\n')
-    *  on http://mintmanga.com/search
+    *  on http://mintmanga.com/search/advanced
     */
     override fun getFilterList() = FilterList(
             Genre("арт", "el_2220"),
@@ -171,6 +164,7 @@ class Mintmanga : ParsedHttpSource() {
             Genre("меха", "el_1318"),
             Genre("мистика", "el_1324"),
             Genre("научная фантастика", "el_1325"),
+            Genre("омегаверс", "el_5676"),
             Genre("повседневность", "el_1327"),
             Genre("постапокалиптика", "el_1342"),
             Genre("приключения", "el_1322"),

app/src/main/java/eu/kanade/tachiyomi/source/online/russian/Readmanga.kt

@@ -27,13 +27,11 @@ class Readmanga : ParsedHttpSource() {
 
     override fun latestUpdatesSelector() = "div.desc"
 
-    override fun popularMangaRequest(page: Int): Request {
+    override fun popularMangaRequest(page: Int): Request =
-        return GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
+            GET("$baseUrl/list?sortType=rate&offset=${70 * (page - 1)}&max=70", headers)
-    }
 
-    override fun latestUpdatesRequest(page: Int): Request {
+    override fun latestUpdatesRequest(page: Int): Request =
-        return GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
+            GET("$baseUrl/list?sortType=updated&offset=${70 * (page - 1)}&max=70", headers)
-    }
 
     override fun popularMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
@@ -44,24 +42,21 @@ class Readmanga : ParsedHttpSource() {
         return manga
     }
 
-    override fun latestUpdatesFromElement(element: Element): SManga {
+    override fun latestUpdatesFromElement(element: Element): SManga =
-        return popularMangaFromElement(element)
+            popularMangaFromElement(element)
-    }
 
     override fun popularMangaNextPageSelector() = "a.nextLink"
 
     override fun latestUpdatesNextPageSelector() = "a.nextLink"
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val genres = filters.filterIsInstance<Genre>().map { it.id + arrayOf("=", "=in", "=ex")[it.state] }.joinToString("&")
+        val genres = filters.filterIsInstance<Genre>().joinToString("&") { it.id + arrayOf("=", "=in", "=ex")[it.state] }
-        return GET("$baseUrl/search?q=$query&$genres", headers)
+        return GET("$baseUrl/search/advanced?q=$query&$genres", headers)
     }
 
     override fun searchMangaSelector() = popularMangaSelector()
 
-    override fun searchMangaFromElement(element: Element): SManga {
+    override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element)
-        return popularMangaFromElement(element)
-    }
 
     // max 200 results
     override fun searchMangaNextPageSelector() = null
@@ -78,13 +73,11 @@ class Readmanga : ParsedHttpSource() {
         return manga
     }
 
-    private fun parseStatus(element: String): Int {
+    private fun parseStatus(element: String): Int = when {
-        when {
+        element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> SManga.LICENSED
-            element.contains("<h3>Запрещена публикация произведения по копирайту</h3>") -> return SManga.LICENSED
+        element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> SManga.COMPLETED
-            element.contains("<h1 class=\"names\"> Сингл") || element.contains("<b>Перевод:</b> завершен") -> return SManga.COMPLETED
+        element.contains("<b>Перевод:</b> продолжается") -> SManga.ONGOING
-            element.contains("<b>Перевод:</b> продолжается") -> return SManga.ONGOING
+        else -> SManga.UNKNOWN
-            else -> return SManga.UNKNOWN
-        }
     }
 
     override fun chapterListSelector() = "div.chapters-link tbody tr"
@@ -149,7 +142,7 @@ class Readmanga : ParsedHttpSource() {
     /* [...document.querySelectorAll("tr.advanced_option:nth-child(1) > td:nth-child(3) span.js-link")].map((el,i) => {
     *  const onClick=el.getAttribute('onclick');const id=onClick.substr(31,onClick.length-33);
     *  return `Genre("${el.textContent.trim()}", "${id}")` }).join(',\n')
-    *  on http://readmanga.me/search
+    *  on http://readmanga.me/search/advanced
     */
     override fun getFilterList() = FilterList(
             Genre("арт", "el_5685"),

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/BaseController.kt

@@ -1,27 +1,44 @@
 package eu.kanade.tachiyomi.ui.base.controller
 
 import android.os.Bundle
-import android.support.v4.view.MenuItemCompat
 import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import com.bluelinelabs.conductor.Controller
 import com.bluelinelabs.conductor.ControllerChangeHandler
 import com.bluelinelabs.conductor.ControllerChangeType
 import com.bluelinelabs.conductor.RestoreViewOnCreateController
+import kotlinx.android.extensions.LayoutContainer
+import kotlinx.android.synthetic.*
 
-abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateController(bundle) {
+abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateController(bundle),
+        LayoutContainer {
+
+    init {
+        addLifecycleListener(object : LifecycleListener() {
+            override fun postCreateView(controller: Controller, view: View) {
+                onViewCreated(view)
+            }
+        })
+    }
+
+    override val containerView: View?
+        get() = view
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup, savedViewState: Bundle?): View {
-        val view = inflateView(inflater, container)
+        return inflateView(inflater, container)
-        onViewCreated(view, savedViewState)
+    }
-        return view
+
+    override fun onDestroyView(view: View) {
+        super.onDestroyView(view)
+        clearFindViewByIdCache()
     }
 
     abstract fun inflateView(inflater: LayoutInflater, container: ViewGroup): View
 
-    open fun onViewCreated(view: View, savedViewState: Bundle?) { }
+    open fun onViewCreated(view: View) { }
 
     override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
         if (type.isEnter) {
@@ -34,7 +51,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
         return null
     }
 
-    private fun setTitle() {
+    fun setTitle() {
         var parentController = parentController
         while (parentController != null) {
             if (parentController is BaseController && parentController.getTitle() != null) {
@@ -52,7 +69,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
      * Issue link: https://issuetracker.google.com/issues/37657375
      */
     fun MenuItem.fixExpand() {
-        val expandListener = object : MenuItemCompat.OnActionExpandListener {
+        setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                 return true
             }
@@ -61,8 +78,7 @@ abstract class BaseController(bundle: Bundle? = null) : RestoreViewOnCreateContr
                 activity?.invalidateOptionsMenu()
                 return true
             }
-        }
+        })
-        MenuItemCompat.setOnActionExpandListener(this, expandListener)
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt

@@ -5,6 +5,8 @@ import android.os.Build
 import android.support.v4.content.ContextCompat
 import com.bluelinelabs.conductor.Controller
 import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
 
 fun Router.popControllerWithTag(tag: String): Boolean {
     val controller = getControllerWithTag(tag)
@@ -24,4 +26,10 @@ fun Controller.requestPermissionsSafe(permissions: Array<String>, requestCode: I
             }
         }
     }
-}
+}
+
+fun Controller.withFadeTransaction(): RouterTransaction {
+    return RouterTransaction.with(this)
+            .pushChangeHandler(FadeChangeHandler())
+            .popChangeHandler(FadeChangeHandler())
+}

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt

@@ -7,7 +7,7 @@ import nucleus.factory.PresenterFactory
 import nucleus.presenter.Presenter
 
 @Suppress("LeakingThis")
-abstract class NucleusController<P : Presenter<*>>(val bundle: Bundle? = null) : RxController(),
+abstract class NucleusController<P : Presenter<*>>(val bundle: Bundle? = null) : RxController(bundle),
         PresenterFactory<P> {
 
     private val delegate = NucleusConductorDelegate(this)

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/RxController.kt

@@ -30,7 +30,7 @@ abstract class RxController(bundle: Bundle? = null) : BaseController(bundle) {
     }
 
     @CallSuper
-    override fun onViewCreated(view: View, savedViewState: Bundle?) {
+    override fun onViewCreated(view: View) {
         if (untilDestroySubscriptions.isUnsubscribed) {
             untilDestroySubscriptions = CompositeSubscription()
         }

app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseFlexibleViewHolder.kt

@@ -0,0 +1,15 @@
+package eu.kanade.tachiyomi.ui.base.holder
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.viewholders.FlexibleViewHolder
+import kotlinx.android.extensions.LayoutContainer
+
+abstract class BaseFlexibleViewHolder(view: View,
+                                      adapter: FlexibleAdapter<*>,
+                                      stickyHeader: Boolean = false) :
+        FlexibleViewHolder(view, adapter, stickyHeader), LayoutContainer {
+
+    override val containerView: View?
+        get() = itemView
+}

app/src/main/java/eu/kanade/tachiyomi/ui/base/holder/BaseViewHolder.kt

@@ -0,0 +1,11 @@
+package eu.kanade.tachiyomi.ui.base.holder
+
+import android.support.v7.widget.RecyclerView
+import android.view.View
+import kotlinx.android.extensions.LayoutContainer
+
+abstract class BaseViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
+
+    override val containerView: View?
+        get() = itemView
+}

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

@@ -0,0 +1,48 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.getResourceColor
+
+/**
+ * Adapter that holds the catalogue cards.
+ *
+ * @param controller instance of [CatalogueController].
+ */
+class CatalogueAdapter(val controller: CatalogueController) :
+        FlexibleAdapter<IFlexible<*>>(null, controller, true) {
+
+    val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
+
+    init {
+        setDisplayHeadersAtStartUp(true)
+    }
+
+    /**
+     * Listener for browse item clicks.
+     */
+    val browseClickListener: OnBrowseClickListener = controller
+
+    /**
+     * Listener for latest item clicks.
+     */
+    val latestClickListener: OnLatestClickListener = controller
+
+    /**
+     * Listener which should be called when user clicks browse.
+     * Note: Should only be handled by [CatalogueController]
+     */
+    interface OnBrowseClickListener {
+        fun onBrowseClick(position: Int)
+    }
+
+    /**
+     * Listener which should be called when user clicks latest.
+     * Note: Should only be handled by [CatalogueController]
+     */
+    interface OnLatestClickListener {
+        fun onLatestClick(position: Int)
+    }
+}
+

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueController.kt

@@ -1,556 +1,231 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue
-
+
-import android.content.res.Configuration
+import android.support.v7.widget.LinearLayoutManager
-import android.os.Bundle
+import android.support.v7.widget.SearchView
-import android.support.design.widget.Snackbar
+import android.view.*
-import android.support.v4.widget.DrawerLayout
+import com.bluelinelabs.conductor.ControllerChangeHandler
-import android.support.v7.app.AppCompatActivity
+import com.bluelinelabs.conductor.ControllerChangeType
-import android.support.v7.widget.*
+import com.bluelinelabs.conductor.RouterTransaction
-import android.view.*
+import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
-import android.widget.AdapterView
+import com.jakewharton.rxbinding.support.v7.widget.queryTextChangeEvents
-import android.widget.ArrayAdapter
+import eu.davidea.flexibleadapter.FlexibleAdapter
-import android.widget.Spinner
+import eu.davidea.flexibleadapter.items.IFlexible
-import com.afollestad.materialdialogs.MaterialDialog
+import eu.kanade.tachiyomi.R
-import com.bluelinelabs.conductor.RouterTransaction
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
+import eu.kanade.tachiyomi.source.CatalogueSource
-import com.f2prateek.rx.preferences.Preference
+import eu.kanade.tachiyomi.source.online.LoginSource
-import com.jakewharton.rxbinding.support.v7.widget.queryTextChangeEvents
+import eu.kanade.tachiyomi.ui.base.controller.NucleusController
-import com.jakewharton.rxbinding.widget.itemSelections
+import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
-import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController
-import eu.davidea.flexibleadapter.items.IFlexible
+import eu.kanade.tachiyomi.ui.catalogue.global_search.CatalogueSearchController
-import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.catalogue.latest.LatestUpdatesController
-import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController
-import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.widget.preference.SourceLoginDialog
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import kotlinx.android.synthetic.main.catalogue_main_controller.*
-import eu.kanade.tachiyomi.source.model.FilterList
+import uy.kohesive.injekt.Injekt
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import uy.kohesive.injekt.api.get
-import eu.kanade.tachiyomi.ui.base.controller.SecondaryDrawerController
+
-import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
+/**
-import eu.kanade.tachiyomi.ui.manga.MangaController
+ * This controller shows and manages the different catalogues enabled by the user.
-import eu.kanade.tachiyomi.util.*
+ * This controller should only handle UI actions, IO actions should be done by [CataloguePresenter]
-import eu.kanade.tachiyomi.widget.AutofitRecyclerView
+ * [SourceLoginDialog.Listener] refreshes the adapter on successful login of catalogues.
-import eu.kanade.tachiyomi.widget.DrawerSwipeCloseListener
+ * [CatalogueAdapter.OnBrowseClickListener] call function data on browse item click.
-import kotlinx.android.synthetic.main.catalogue_controller.view.*
+ * [CatalogueAdapter.OnLatestClickListener] call function data on latest item click
-import kotlinx.android.synthetic.main.main_activity.*
+ */
-import rx.Observable
+class CatalogueController : NucleusController<CataloguePresenter>(),
-import rx.Subscription
+        SourceLoginDialog.Listener,
-import rx.android.schedulers.AndroidSchedulers
+        FlexibleAdapter.OnItemClickListener,
-import rx.subscriptions.Subscriptions
+        CatalogueAdapter.OnBrowseClickListener,
-import timber.log.Timber
+        CatalogueAdapter.OnLatestClickListener {
-import uy.kohesive.injekt.injectLazy
+
-import java.util.concurrent.TimeUnit
+    /**
-
+     * Application preferences.
-/**
+     */
- * Controller to manage the catalogues available in the app.
+    private val preferences: PreferencesHelper = Injekt.get()
- */
+
-open class CatalogueController(bundle: Bundle? = null) :
+    /**
-        NucleusController<CataloguePresenter>(bundle),
+     * Adapter containing sources.
-        SecondaryDrawerController,
+     */
-        FlexibleAdapter.OnItemClickListener,
+    private var adapter : CatalogueAdapter? = null
-        FlexibleAdapter.OnItemLongClickListener,
+
-        FlexibleAdapter.EndlessScrollListener<ProgressItem>,
+    /**
-        ChangeMangaCategoriesDialog.Listener {
+     * Called when controller is initialized.
-
+     */
-    /**
+    init {
-     * Preferences helper.
+        // Enable the option menu
-     */
+        setHasOptionsMenu(true)
-    private val preferences: PreferencesHelper by injectLazy()
+    }
-
+
-    /**
+    /**
-     * Adapter containing the list of manga from the catalogue.
+     * Set the title of controller.
-     */
+     *
-    private var adapter: FlexibleAdapter<IFlexible<*>>? = null
+     * @return title.
-
+     */
-    /**
+    override fun getTitle(): String? {
-     * Spinner shown in the toolbar to change the selected source.
+        return applicationContext?.getString(R.string.label_catalogues)
-     */
+    }
-    private var spinner: Spinner? = null
+
-
+    /**
-    /**
+     * Create the [CataloguePresenter] used in controller.
-     * Snackbar containing an error message when a request fails.
+     *
-     */
+     * @return instance of [CataloguePresenter]
-    private var snack: Snackbar? = null
+     */
-
+    override fun createPresenter(): CataloguePresenter {
-    /**
+        return CataloguePresenter()
-     * Navigation view containing filter items.
+    }
-     */
+
-    private var navView: CatalogueNavigationView? = null
+    /**
-
+     * Initiate the view with [R.layout.catalogue_main_controller].
-    /**
+     *
-     * Recycler view with the list of results.
+     * @param inflater used to load the layout xml.
-     */
+     * @param container containing parent views.
-    private var recycler: RecyclerView? = null
+     * @return inflated view.
-
+     */
-    private var drawerListener: DrawerLayout.DrawerListener? = null
+    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
-
+        return inflater.inflate(R.layout.catalogue_main_controller, container, false)
-    /**
+    }
-     * Query of the search box.
+
-     */
+    /**
-    private val query: String
+     * Called when the view is created
-        get() = presenter.query
+     *
-
+     * @param view view of controller
-    /**
+     */
-     * Selected index of the spinner (selected source).
+    override fun onViewCreated(view: View) {
-     */
+        super.onViewCreated(view)
-    private var selectedIndex: Int = 0
+
-
+        adapter = CatalogueAdapter(this)
-    /**
+
-     * Subscription for the search view.
+        // Create recycler and set adapter.
-     */
+        recycler.layoutManager = LinearLayoutManager(view.context)
-    private var searchViewSubscription: Subscription? = null
+        recycler.adapter = adapter
-
+        recycler.addItemDecoration(SourceDividerItemDecoration(view.context))
-    private var numColumnsSubscription: Subscription? = null
+    }
-
+
-    private var progressItem: ProgressItem? = null
+    override fun onDestroyView(view: View) {
-
+        adapter = null
-    init {
+        super.onDestroyView(view)
-        setHasOptionsMenu(true)
+    }
-    }
+
-
+    override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {
-    override fun getTitle(): String? {
+        super.onChangeStarted(handler, type)
-        return ""
+        if (!type.isPush && handler is SettingsSourcesFadeChangeHandler) {
-    }
+            presenter.updateSources()
-
+        }
-    override fun createPresenter(): CataloguePresenter {
+    }
-        return CataloguePresenter()
+
-    }
+    /**
-
+     * Called when login dialog is closed, refreshes the adapter.
-    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
+     *
-        return inflater.inflate(R.layout.catalogue_controller, container, false)
+     * @param source clicked item containing source information.
-    }
+     */
-
+    override fun loginDialogClosed(source: LoginSource) {
-    override fun onViewCreated(view: View, savedViewState: Bundle?) {
+        if (source.isLogged()) {
-        super.onViewCreated(view, savedViewState)
+            adapter?.clear()
-
+            presenter.loadSources()
-        // Initialize adapter, scroll listener and recycler views
+        }
-        adapter = FlexibleAdapter(null, this)
+    }
-        setupRecycler(view)
+
-
+    /**
-        // Create toolbar spinner
+     * Called when item is clicked
-        val themedContext = (activity as AppCompatActivity).supportActionBar?.themedContext
+     */
-                ?: activity
+    override fun onItemClick(position: Int): Boolean {
-
+        val item = adapter?.getItem(position) as? SourceItem ?: return false
-        val spinnerAdapter = ArrayAdapter(themedContext,
+        val source = item.source
-                android.R.layout.simple_spinner_item, presenter.sources)
+        if (source is LoginSource && !source.isLogged()) {
-        spinnerAdapter.setDropDownViewResource(R.layout.common_spinner_item)
+            val dialog = SourceLoginDialog(source)
-
+            dialog.targetController = this
-        val onItemSelected: (Int) -> Unit = { position ->
+            dialog.showDialog(router)
-            val source = spinnerAdapter.getItem(position)
+        } else {
-            if (!presenter.isValidSource(source)) {
+            // Open the catalogue view.
-                spinner?.setSelection(selectedIndex)
+            openCatalogue(source, BrowseCatalogueController(source))
-                activity?.toast(R.string.source_requires_login)
+        }
-            } else if (source != presenter.source) {
+        return false
-                selectedIndex = position
+    }
-                showProgressBar()
+
-                adapter?.clear()
+    /**
-                presenter.setActiveSource(source)
+     * Called when browse is clicked in [CatalogueAdapter]
-                navView?.setFilters(presenter.filterItems)
+     */
-                activity?.invalidateOptionsMenu()
+    override fun onBrowseClick(position: Int) {
-            }
+        onItemClick(position)
-        }
+    }
-
+
-        selectedIndex = presenter.sources.indexOf(presenter.source)
+    /**
-
+     * Called when latest is clicked in [CatalogueAdapter]
-        spinner = Spinner(themedContext).apply {
+     */
-            adapter = spinnerAdapter
+    override fun onLatestClick(position: Int) {
-            setSelection(selectedIndex)
+        val item = adapter?.getItem(position) as? SourceItem ?: return
-            itemSelections()
+        openCatalogue(item.source, LatestUpdatesController(item.source))
-                    .skip(1)
+    }
-                    .filter { it != AdapterView.INVALID_POSITION }
+
-                    .subscribeUntilDestroy { onItemSelected(it) }
+    /**
-        }
+     * Opens a catalogue with the given controller.
-
+     */
-        activity?.toolbar?.addView(spinner)
+    private fun openCatalogue(source: CatalogueSource, controller: BrowseCatalogueController) {
-
+        preferences.lastUsedCatalogueSource().set(source.id)
-        view.progress?.visible()
+        router.pushController(controller.withFadeTransaction())
-    }
+    }
-
+
-    override fun onDestroyView(view: View) {
+    /**
-        super.onDestroyView(view)
+     * Adds items to the options menu.
-        activity?.toolbar?.removeView(spinner)
+     *
-        numColumnsSubscription?.unsubscribe()
+     * @param menu menu containing options.
-        numColumnsSubscription = null
+     * @param inflater used to load the menu xml.
-        searchViewSubscription?.unsubscribe()
+     */
-        searchViewSubscription = null
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        adapter = null
+        // Inflate menu
-        spinner = null
+        inflater.inflate(R.menu.catalogue_main, menu)
-        snack = null
+
-        recycler = null
+        // Initialize search option.
-    }
+        val searchItem = menu.findItem(R.id.action_search)
-
+        val searchView = searchItem.actionView as SearchView
-    override fun createSecondaryDrawer(drawer: DrawerLayout): ViewGroup? {
+
-        // Inflate and prepare drawer
+        // Change hint to show global search.
-        val navView = drawer.inflate(R.layout.catalogue_drawer) as CatalogueNavigationView
+        searchView.queryHint = applicationContext?.getString(R.string.action_global_search_hint)
-        this.navView = navView
+
-        drawerListener = DrawerSwipeCloseListener(drawer, navView).also {
+        // Create query listener which opens the global search view.
-            drawer.addDrawerListener(it)
+        searchView.queryTextChangeEvents()
-        }
+                .filter { it.isSubmitted }
-        navView.setFilters(presenter.filterItems)
+                .subscribeUntilDestroy {
-
+                    val query = it.queryText().toString()
-        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.END)
+                    router.pushController(CatalogueSearchController(query).withFadeTransaction())
-
+                }
-        navView.onSearchClicked = {
+    }
-            val allDefault = presenter.sourceFilters == presenter.source.getFilterList()
+
-            showProgressBar()
+    /**
-            adapter?.clear()
+     * Called when an option menu item has been selected by the user.
-            presenter.setSourceFilter(if (allDefault) FilterList() else presenter.sourceFilters)
+     *
-        }
+     * @param item The selected item.
-
+     * @return True if this event has been consumed, false if it has not.
-        navView.onResetClicked = {
+     */
-            presenter.appliedFilters = FilterList()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-            val newFilters = presenter.source.getFilterList()
+        when (item.itemId) {
-            presenter.sourceFilters = newFilters
+            // Initialize option to open catalogue settings.
-            navView.setFilters(presenter.filterItems)
+            R.id.action_settings -> {
-        }
+                router.pushController((RouterTransaction.with(SettingsSourcesController()))
-        return navView
+                        .popChangeHandler(SettingsSourcesFadeChangeHandler())
-    }
+                        .pushChangeHandler(FadeChangeHandler()))
-
+            }
-    override fun cleanupSecondaryDrawer(drawer: DrawerLayout) {
+            else -> return super.onOptionsItemSelected(item)
-        drawerListener?.let { drawer.removeDrawerListener(it) }
+        }
-        drawerListener = null
+        return true
-        navView = null
+    }
-    }
+
-
+    /**
-    private fun setupRecycler(view: View) {
+     * Called to update adapter containing sources.
-        numColumnsSubscription?.unsubscribe()
+     */
-
+    fun setSources(sources: List<IFlexible<*>>) {
-        var oldPosition = RecyclerView.NO_POSITION
+        adapter?.updateDataSet(sources)
-            val oldRecycler = view.catalogue_view?.getChildAt(1)
+    }
-            if (oldRecycler is RecyclerView) {
+
-                oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
+    /**
-                oldRecycler.adapter = null
+     * Called to set the last used catalogue at the top of the view.
-
+     */
-                view.catalogue_view?.removeView(oldRecycler)
+    fun setLastUsedSource(item: SourceItem?) {
-            }
+        adapter?.removeAllScrollableHeaders()
-
+        if (item != null) {
-        val recycler = if (presenter.isListMode) {
+            adapter?.addScrollableHeader(item)
-            RecyclerView(view.context).apply {
+        }
-                id = R.id.recycler
+    }
-                layoutManager = LinearLayoutManager(context)
+
-                addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+    class SettingsSourcesFadeChangeHandler : FadeChangeHandler()
-            }
+}
-        } else {
-            (view.catalogue_view.inflate(R.layout.catalogue_recycler_autofit) as AutofitRecyclerView).apply {
-                numColumnsSubscription = getColumnsPreferenceForCurrentOrientation().asObservable()
-                        .doOnNext { spanCount = it }
-                        .skip(1)
-                        // Set again the adapter to recalculate the covers height
-                        .subscribe { adapter = this@CatalogueController.adapter }
-
-                (layoutManager as GridLayoutManager).spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-                    override fun getSpanSize(position: Int): Int {
-                        return when (adapter?.getItemViewType(position)) {
-                            R.layout.catalogue_grid_item, null -> 1
-                            else -> spanCount
-                        }
-                    }
-                }
-            }
-        }
-        recycler.setHasFixedSize(true)
-        recycler.adapter = adapter
-
-        view.catalogue_view.addView(recycler, 1)
-
-        if (oldPosition != RecyclerView.NO_POSITION) {
-            recycler.layoutManager.scrollToPosition(oldPosition)
-        }
-        this.recycler = recycler
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.catalogue_list, menu)
-
-        // Initialize search menu
-        menu.findItem(R.id.action_search).apply {
-            val searchView = actionView as SearchView
-
-            if (!query.isBlank()) {
-                expandActionView()
-                searchView.setQuery(query, true)
-                searchView.clearFocus()
-            }
-
-            val searchEventsObservable = searchView.queryTextChangeEvents()
-                    .skip(1)
-                    .share()
-            val writingObservable = searchEventsObservable
-                    .filter { !it.isSubmitted }
-                    .debounce(1250, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
-            val submitObservable = searchEventsObservable
-                    .filter { it.isSubmitted }
-
-            searchViewSubscription?.unsubscribe()
-            searchViewSubscription = Observable.merge(writingObservable, submitObservable)
-                    .map { it.queryText().toString() }
-                    .distinctUntilChanged()
-                    .subscribeUntilDestroy { searchWithQuery(it) }
-
-            untilDestroySubscriptions.add(
-                    Subscriptions.create { if (isActionViewExpanded) collapseActionView() })
-        }
-
-        // Setup filters button
-        menu.findItem(R.id.action_set_filter).apply {
-            icon.mutate()
-            if (presenter.sourceFilters.isEmpty()) {
-                isEnabled = false
-                icon.alpha = 128
-            } else {
-                isEnabled = true
-                icon.alpha = 255
-            }
-        }
-
-        // Show next display mode
-        menu.findItem(R.id.action_display_mode).apply {
-            val icon = if (presenter.isListMode)
-                R.drawable.ic_view_module_white_24dp
-            else
-                R.drawable.ic_view_list_white_24dp
-            setIcon(icon)
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_display_mode -> swapDisplayMode()
-            R.id.action_set_filter -> navView?.let { activity?.drawer?.openDrawer(Gravity.END) }
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
-
-    /**
-     * Restarts the request with a new query.
-     *
-     * @param newQuery the new query.
-     */
-    private fun searchWithQuery(newQuery: String) {
-        // If text didn't change, do nothing
-        if (query == newQuery)
-            return
-
-        showProgressBar()
-        adapter?.clear()
-
-        presenter.restartPager(newQuery)
-    }
-
-    /**
-     * Called from the presenter when the network request is received.
-     *
-     * @param page the current page.
-     * @param mangas the list of manga of the page.
-     */
-    fun onAddPage(page: Int, mangas: List<CatalogueItem>) {
-        val adapter = adapter ?: return
-        hideProgressBar()
-        if (page == 1) {
-            adapter.clear()
-            resetProgressItem()
-        }
-        adapter.onLoadMoreComplete(mangas)
-    }
-
-    /**
-     * Called from the presenter when the network request fails.
-     *
-     * @param error the error received.
-     */
-    fun onAddPageError(error: Throwable) {
-        Timber.e(error)
-        val adapter = adapter ?: return
-        adapter.onLoadMoreComplete(null)
-        hideProgressBar()
-
-        val message = if (error is NoResultsException) "No results found" else (error.message ?: "")
-
-        snack?.dismiss()
-        snack = view?.catalogue_view?.snack(message, Snackbar.LENGTH_INDEFINITE) {
-            setAction(R.string.action_retry) {
-                // If not the first page, show bottom progress bar.
-                if (adapter.mainItemCount > 0) {
-                    val item = progressItem ?: return@setAction
-                    adapter.addScrollableFooterWithDelay(item, 0, true)
-                } else {
-                    showProgressBar()
-                }
-                presenter.requestNext()
-            }
-        }
-    }
-
-    /**
-     * Sets a new progress item and reenables the scroll listener.
-     */
-    private fun resetProgressItem() {
-        progressItem = ProgressItem()
-        adapter?.endlessTargetCount = 0
-        adapter?.setEndlessScrollListener(this, progressItem!!)
-    }
-
-    /**
-     * Called by the adapter when scrolled near the bottom.
-     */
-    override fun onLoadMore(lastPosition: Int, currentPage: Int) {
-        Timber.e("onLoadMore")
-        if (presenter.hasNextPage()) {
-            presenter.requestNext()
-        } else {
-            adapter?.onLoadMoreComplete(null)
-            adapter?.endlessTargetCount = 1
-        }
-    }
-
-    override fun noMoreLoad(newItemsSize: Int) {
-    }
-
-    /**
-     * Called from the presenter when a manga is initialized.
-     *
-     * @param manga the manga initialized
-     */
-    fun onMangaInitialized(manga: Manga) {
-        getHolder(manga)?.setImage(manga)
-    }
-
-    /**
-     * Swaps the current display mode.
-     */
-    fun swapDisplayMode() {
-        val view = view ?: return
-        val adapter = adapter ?: return
-
-        presenter.swapDisplayMode()
-        val isListMode = presenter.isListMode
-        activity?.invalidateOptionsMenu()
-        setupRecycler(view)
-        if (!isListMode || !view.context.connectivityManager.isActiveNetworkMetered) {
-            // Initialize mangas if going to grid view or if over wifi when going to list view
-            val mangas = (0..adapter.itemCount-1).mapNotNull {
-                (adapter.getItem(it) as? CatalogueItem)?.manga
-            }
-            presenter.initializeMangas(mangas)
-        }
-    }
-
-    /**
-     * Returns a preference for the number of manga per row based on the current orientation.
-     *
-     * @return the preference.
-     */
-    fun getColumnsPreferenceForCurrentOrientation(): Preference<Int> {
-        return if (resources?.configuration?.orientation == Configuration.ORIENTATION_PORTRAIT)
-            presenter.prefs.portraitColumns()
-        else
-            presenter.prefs.landscapeColumns()
-    }
-
-    /**
-     * Returns the view holder for the given manga.
-     *
-     * @param manga the manga to find.
-     * @return the holder of the manga or null if it's not bound.
-     */
-    private fun getHolder(manga: Manga): CatalogueHolder? {
-        val adapter = adapter ?: return null
-
-        adapter.allBoundViewHolders.forEach { holder ->
-            val item = adapter.getItem(holder.adapterPosition) as? CatalogueItem
-            if (item != null && item.manga.id!! == manga.id!!) {
-                return holder as CatalogueHolder
-            }
-        }
-
-        return null
-    }
-
-    /**
-     * Shows the progress bar.
-     */
-    private fun showProgressBar() {
-        view?.progress?.visible()
-        snack?.dismiss()
-        snack = null
-    }
-
-    /**
-     * Hides active progress bars.
-     */
-    private fun hideProgressBar() {
-        view?.progress?.gone()
-    }
-
-    /**
-     * Called when a manga is clicked.
-     *
-     * @param position the position of the element clicked.
-     * @return true if the item should be selected, false otherwise.
-     */
-    override fun onItemClick(position: Int): Boolean {
-        val item = adapter?.getItem(position) as? CatalogueItem ?: return false
-        router.pushController(RouterTransaction.with(MangaController(item.manga, true))
-                .pushChangeHandler(FadeChangeHandler())
-                .popChangeHandler(FadeChangeHandler()))
-
-        return false
-    }
-
-    /**
-     * Called when a manga is long clicked.
-     *
-     * Adds the manga to the default category if none is set it shows a list of categories for the user to put the manga
-     * in, the list consists of the default category plus the user's categories. The default category is preselected on
-     * new manga, and on already favorited manga the manga's categories are preselected.
-     *
-     * @param position the position of the element clicked.
-     */
-    override fun onItemLongClick(position: Int) {
-        val manga = (adapter?.getItem(position) as? CatalogueItem?)?.manga ?: return
-        if (manga.favorite) {
-            MaterialDialog.Builder(activity!!)
-                    .items(resources?.getString(R.string.remove_from_library))
-                    .itemsCallback { _, _, which, _ ->
-                        when (which) {
-                            0 -> {
-                                presenter.changeMangaFavorite(manga)
-                                adapter?.notifyItemChanged(position)
-                            }
-                        }
-                    }.show()
-        } else {
-            presenter.changeMangaFavorite(manga)
-            adapter?.notifyItemChanged(position)
-
-            val categories = presenter.getCategories()
-            val defaultCategory = categories.find { it.id == preferences.defaultCategory() }
-            if (defaultCategory != null) {
-                presenter.moveMangaToCategory(manga, defaultCategory)
-            } else if (categories.size <= 1) { // default or the one from the user
-                presenter.moveMangaToCategory(manga, categories.firstOrNull())
-            } else {
-                val ids = presenter.getMangaCategoryIds(manga)
-                val preselected = ids.mapNotNull { id ->
-                    categories.indexOfFirst { it.id == id }.takeIf { it != -1 }
-                }.toTypedArray()
-
-                ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
-                        .showDialog(router)
-            }
-        }
-
-    }
-
-    /**
-     * Update manga to use selected categories.
-     *
-     * @param mangas The list of manga to move to categories.
-     * @param categories The list of categories where manga will be placed.
-     */
-    override fun updateCategoriesForMangas(mangas: List<Manga>, categories: List<Category>) {
-        val manga = mangas.firstOrNull() ?: return
-        presenter.updateMangaCategories(manga, categories)
-    }
-
-}

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

@@ -1,308 +1,99 @@
 package eu.kanade.tachiyomi.ui.catalogue
 
 import android.os.Bundle
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.flexibleadapter.items.ISectionable
-import eu.kanade.tachiyomi.data.cache.CoverCache
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.Category
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.models.MangaCategory
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.source.model.Filter
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.source.online.LoginSource
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.ui.catalogue.filter.*
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import rx.subjects.PublishSubject
-import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
+import java.util.*
+import java.util.concurrent.TimeUnit
 
 /**
- * Presenter of [CatalogueController].
+ * Presenter of [CatalogueController]
+ * Function calls should be done from here. UI calls should be done from the controller.
+ *
+ * @param sourceManager manages the different sources.
+ * @param preferences application preferences.
  */
-open class CataloguePresenter(
+class CataloguePresenter(
         val sourceManager: SourceManager = Injekt.get(),
-        val db: DatabaseHelper = Injekt.get(),
+        private val preferences: PreferencesHelper = Injekt.get()
-        val prefs: PreferencesHelper = Injekt.get(),
-        val coverCache: CoverCache = Injekt.get()
 ) : BasePresenter<CatalogueController>() {
 
     /**
      * Enabled sources.
      */
-    val sources by lazy { getEnabledSources() }
+    var sources = getEnabledSources()
 
     /**
-     * Active source.
+     * Subscription for retrieving enabled sources.
      */
-    lateinit var source: CatalogueSource
+    private var sourceSubscription: Subscription? = null
-        private set
-
-    /**
-     * Query from the view.
-     */
-    var query = ""
-        private set
-
-    /**
-     * Modifiable list of filters.
-     */
-    var sourceFilters = FilterList()
-        set(value) {
-            field = value
-            filterItems = value.toItems()
-        }
-
-    var filterItems: List<IFlexible<*>> = emptyList()
-
-    /**
-     * List of filters used by the [Pager]. If empty alongside [query], the popular query is used.
-     */
-    var appliedFilters = FilterList()
-
-    /**
-     * Pager containing a list of manga results.
-     */
-    private lateinit var pager: Pager
-
-    /**
-     * Subject that initializes a list of manga.
-     */
-    private val mangaDetailSubject = PublishSubject.create<List<Manga>>()
-
-    /**
-     * Whether the view is in list mode or not.
-     */
-    var isListMode: Boolean = false
-        private set
-
-    /**
-     * Subscription for the pager.
-     */
-    private var pagerSubscription: Subscription? = null
-
-    /**
-     * Subscription for one request from the pager.
-     */
-    private var pageSubscription: Subscription? = null
-
-    /**
-     * Subscription to initialize manga details.
-     */
-    private var initializerSubscription: Subscription? = null
 
     override fun onCreate(savedState: Bundle?) {
         super.onCreate(savedState)
 
-        source = getLastUsedSource()
+        // Load enabled and last used sources
-        sourceFilters = source.getFilterList()
+        loadSources()
+        loadLastUsedSource()
+    }
 
-        if (savedState != null) {
+    /**
-            query = savedState.getString(CataloguePresenter::query.name, "")
+     * Unsubscribe and create a new subscription to fetch enabled sources.
+     */
+    fun loadSources() {
+        sourceSubscription?.unsubscribe()
+
+        val map = TreeMap<String, MutableList<CatalogueSource>> { d1, d2 ->
+            // Catalogues without a lang defined will be placed at the end
+            when {
+                d1 == "" && d2 != "" -> 1
+                d2 == "" && d1 != "" -> -1
+                else -> d1.compareTo(d2)
+            }
+        }
+        val byLang = sources.groupByTo(map, { it.lang })
+        val sourceItems = byLang.flatMap {
+            val langItem = LangItem(it.key)
+            it.value.map { source -> SourceItem(source, langItem) }
         }
 
-        add(prefs.catalogueAsList().asObservable()
+        sourceSubscription = Observable.just(sourceItems)
-                .subscribe { setDisplayMode(it) })
+                .subscribeLatestCache(CatalogueController::setSources)
-
-        restartPager()
     }
 
-    override fun onSave(state: Bundle) {
+    private fun loadLastUsedSource() {
-        state.putString(CataloguePresenter::query.name, query)
+        val sharedObs = preferences.lastUsedCatalogueSource().asObservable().share()
-        super.onSave(state)
+
+        // Emit the first item immediately but delay subsequent emissions by 500ms.
+        Observable.merge(
+                sharedObs.take(1),
+                sharedObs.skip(1).delay(500, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread()))
+                .distinctUntilChanged()
+                .map { (sourceManager.get(it) as? CatalogueSource)?.let { SourceItem(it) } }
+                .subscribeLatestCache(CatalogueController::setLastUsedSource)
     }
 
-    /**
+    fun updateSources() {
-     * Restarts the pager for the active source with the provided query and filters.
+        sources = getEnabledSources()
-     *
+        loadSources()
-     * @param query the query.
-     * @param filters the current state of the filters (for search mode).
-     */
-    fun restartPager(query: String = this.query, filters: FilterList = this.appliedFilters) {
-        this.query = query
-        this.appliedFilters = filters
-
-        subscribeToMangaInitializer()
-
-        // Create a new pager.
-        pager = createPager(query, filters)
-
-        val sourceId = source.id
-
-        // Prepare the pager.
-        pagerSubscription?.let { remove(it) }
-        pagerSubscription = pager.results()
-                .observeOn(Schedulers.io())
-                .map { it.first to it.second.map { networkToLocalManga(it, sourceId) } }
-                .doOnNext { initializeMangas(it.second) }
-                .map { it.first to it.second.map(::CatalogueItem) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribeReplay({ view, pair ->
-                    view.onAddPage(pair.first, pair.second)
-                }, { view, error ->
-                    Timber.e(error)
-                })
-
-        // Request first page.
-        requestNext()
-    }
-
-    /**
-     * Requests the next page for the active pager.
-     */
-    fun requestNext() {
-        if (!hasNextPage()) return
-
-        pageSubscription?.let { remove(it) }
-        pageSubscription = Observable.defer { pager.requestNext() }
-                .subscribeFirst({ view, page ->
-                    // Nothing to do when onNext is emitted.
-                }, CatalogueController::onAddPageError)
-    }
-
-    /**
-     * Returns true if the last fetched page has a next page.
-     */
-    fun hasNextPage(): Boolean {
-        return pager.hasNextPage
-    }
-
-    /**
-     * Sets the active source and restarts the pager.
-     *
-     * @param source the new active source.
-     */
-    fun setActiveSource(source: CatalogueSource) {
-        prefs.lastUsedCatalogueSource().set(source.id)
-        this.source = source
-        sourceFilters = source.getFilterList()
-
-        restartPager(query = "", filters = FilterList())
-    }
-
-    /**
-     * Sets the display mode.
-     *
-     * @param asList whether the current mode is in list or not.
-     */
-    private fun setDisplayMode(asList: Boolean) {
-        isListMode = asList
-        subscribeToMangaInitializer()
-    }
-
-    /**
-     * Subscribes to the initializer of manga details and updates the view if needed.
-     */
-    private fun subscribeToMangaInitializer() {
-        initializerSubscription?.let { remove(it) }
-        initializerSubscription = mangaDetailSubject.observeOn(Schedulers.io())
-                .flatMap { Observable.from(it) }
-                .filter { it.thumbnail_url == null && !it.initialized }
-                .concatMap { getMangaDetailsObservable(it) }
-                .onBackpressureBuffer()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ manga ->
-                    @Suppress("DEPRECATION")
-                    view?.onMangaInitialized(manga)
-                }, { error ->
-                    Timber.e(error)
-                })
-                .apply { add(this) }
-    }
-
-    /**
-     * Returns a manga from the database for the given manga from network. It creates a new entry
-     * if the manga is not yet in the database.
-     *
-     * @param sManga the manga from the source.
-     * @return a manga from the database.
-     */
-    private fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {
-        var localManga = db.getManga(sManga.url, sourceId).executeAsBlocking()
-        if (localManga == null) {
-            val newManga = Manga.create(sManga.url, sManga.title, sourceId)
-            newManga.copyFrom(sManga)
-            val result = db.insertManga(newManga).executeAsBlocking()
-            newManga.id = result.insertedId()
-            localManga = newManga
-        }
-        return localManga
-    }
-
-    /**
-     * Initialize a list of manga.
-     *
-     * @param mangas the list of manga to initialize.
-     */
-    fun initializeMangas(mangas: List<Manga>) {
-        mangaDetailSubject.onNext(mangas)
-    }
-
-    /**
-     * Returns an observable of manga that initializes the given manga.
-     *
-     * @param manga the manga to initialize.
-     * @return an observable of the manga to initialize
-     */
-    private fun getMangaDetailsObservable(manga: Manga): Observable<Manga> {
-        return source.fetchMangaDetails(manga)
-                .flatMap { networkManga ->
-                    manga.copyFrom(networkManga)
-                    manga.initialized = true
-                    db.insertManga(manga).executeAsBlocking()
-                    Observable.just(manga)
-                }
-                .onErrorResumeNext { Observable.just(manga) }
-    }
-
-    /**
-     * Returns the last used source from preferences or the first valid source.
-     *
-     * @return a source.
-     */
-    fun getLastUsedSource(): CatalogueSource {
-        val id = prefs.lastUsedCatalogueSource().get() ?: -1
-        val source = sourceManager.get(id)
-        if (!isValidSource(source) || source !in sources) {
-            return sources.first { isValidSource(it) }
-        }
-        return source as CatalogueSource
-    }
-
-    /**
-     * Checks if the given source is valid.
-     *
-     * @param source the source to check.
-     * @return true if the source is valid, false otherwise.
-     */
-    open fun isValidSource(source: Source?): Boolean {
-        if (source == null) return false
-
-        if (source is LoginSource) {
-            return source.isLogged() ||
-                    (prefs.sourceUsername(source) != "" && prefs.sourcePassword(source) != "")
-        }
-        return true
     }
 
     /**
      * Returns a list of enabled sources ordered by language and name.
+     *
+     * @return list containing enabled sources.
      */
-    open protected fun getEnabledSources(): List<CatalogueSource> {
+    private fun getEnabledSources(): List<CatalogueSource> {
-        val languages = prefs.enabledLanguages().getOrDefault()
+        val languages = preferences.enabledLanguages().getOrDefault()
-        val hiddenCatalogues = prefs.hiddenCatalogues().getOrDefault()
+        val hiddenCatalogues = preferences.hiddenCatalogues().getOrDefault()
 
         return sourceManager.getCatalogueSources()
                 .filter { it.lang in languages }
@@ -310,133 +101,4 @@ open class CataloguePresenter(
                 .sortedBy { "(${it.lang}) ${it.name}" } +
                 sourceManager.get(LocalSource.ID) as LocalSource
     }
-
-    /**
-     * Adds or removes a manga from the library.
-     *
-     * @param manga the manga to update.
-     */
-    fun changeMangaFavorite(manga: Manga) {
-        manga.favorite = !manga.favorite
-        if (!manga.favorite) {
-            coverCache.deleteFromCache(manga.thumbnail_url)
-        }
-        db.insertManga(manga).executeAsBlocking()
-    }
-
-    /**
-     * Changes the active display mode.
-     */
-    fun swapDisplayMode() {
-        prefs.catalogueAsList().set(!isListMode)
-    }
-
-    /**
-     * Set the filter states for the current source.
-     *
-     * @param filters a list of active filters.
-     */
-    fun setSourceFilter(filters: FilterList) {
-        restartPager(filters = filters)
-    }
-
-    open fun createPager(query: String, filters: FilterList): Pager {
-        return CataloguePager(source, query, filters)
-    }
-
-    private fun FilterList.toItems(): List<IFlexible<*>> {
-        return mapNotNull {
-            when (it) {
-                is Filter.Header -> HeaderItem(it)
-                is Filter.Separator -> SeparatorItem(it)
-                is Filter.CheckBox -> CheckboxItem(it)
-                is Filter.TriState -> TriStateItem(it)
-                is Filter.Text -> TextItem(it)
-                is Filter.Select<*> -> SelectItem(it)
-                is Filter.Group<*> -> {
-                    val group = GroupItem(it)
-                    val subItems = it.state.mapNotNull {
-                        when (it) {
-                            is Filter.CheckBox -> CheckboxSectionItem(it)
-                            is Filter.TriState -> TriStateSectionItem(it)
-                            is Filter.Text -> TextSectionItem(it)
-                            is Filter.Select<*> -> SelectSectionItem(it)
-                            else -> null
-                        } as? ISectionable<*, *>
-                    }
-                    subItems.forEach { it.header = group }
-                    group.subItems = subItems
-                    group
-                }
-                is Filter.Sort -> {
-                    val group = SortGroup(it)
-                    val subItems = it.values.mapNotNull {
-                        SortItem(it, group)
-                    }
-                    group.subItems = subItems
-                    group
-                }
-                else -> null
-            }
-        }
-    }
-
-    /**
-     * Get the default, and user categories.
-     *
-     * @return List of categories, default plus user categories
-     */
-    fun getCategories(): List<Category> {
-        return db.getCategories().executeAsBlocking()
-    }
-
-    /**
-     * Gets the category id's the manga is in, if the manga is not in a category, returns the default id.
-     *
-     * @param manga the manga to get categories from.
-     * @return Array of category ids the manga is in, if none returns default id
-     */
-    fun getMangaCategoryIds(manga: Manga): Array<Int?> {
-        val categories = db.getCategoriesForManga(manga).executeAsBlocking()
-        return categories.mapNotNull { it.id }.toTypedArray()
-    }
-
-    /**
-     * Move the given manga to categories.
-     *
-     * @param categories the selected categories.
-     * @param manga the manga to move.
-     */
-    fun moveMangaToCategories(manga: Manga, categories: List<Category>) {
-        val mc = categories.filter { it.id != 0 }.map { MangaCategory.create(manga, it) }
-        db.setMangaCategories(mc, listOf(manga))
-    }
-
-    /**
-     * Move the given manga to the category.
-     *
-     * @param category the selected category.
-     * @param manga the manga to move.
-     */
-    fun moveMangaToCategory(manga: Manga, category: Category?) {
-        moveMangaToCategories(manga, listOfNotNull(category))
-    }
-
-    /**
-     * Update manga to use selected categories.
-     *
-     * @param manga needed to change
-     * @param selectedCategories selected categories
-     */
-    fun updateMangaCategories(manga: Manga, selectedCategories: List<Category>) {
-        if (!selectedCategories.isEmpty()) {
-            if (!manga.favorite)
-                changeMangaFavorite(manga)
-
-            moveMangaToCategories(manga, selectedCategories.filter { it.id != 0 })
-        } else {
-            changeMangaFavorite(manga)
-        }
-    }
-
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/LangHolder.kt

@@ -0,0 +1,22 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import kotlinx.android.synthetic.main.catalogue_main_controller_card.*
+import java.util.*
+
+class LangHolder(view: View, adapter: FlexibleAdapter<*>) :
+        BaseFlexibleViewHolder(view, adapter, true) {
+
+    fun bind(item: LangItem) {
+        title.text = when {
+            item.code == "" -> itemView.context.getString(R.string.other_source)
+            else -> {
+                val locale = Locale(item.code)
+                locale.getDisplayName(locale).capitalize()
+            }
+        }
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/LangItem.kt

@@ -0,0 +1,38 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractHeaderItem
+import eu.kanade.tachiyomi.R
+
+/**
+ * Item that contains the language header.
+ *
+ * @param code The lang code.
+ */
+data class LangItem(val code: String) : AbstractHeaderItem<LangHolder>() {
+
+    /**
+     * Returns the layout resource of this item.
+     */
+    override fun getLayoutRes(): Int {
+        return R.layout.catalogue_main_controller_card
+    }
+
+    /**
+     * Creates a new view holder for this item.
+     */
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): LangHolder {
+        return LangHolder(view, adapter)
+    }
+
+    /**
+     * Binds this item to the given view holder.
+     */
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: LangHolder,
+                                position: Int, payloads: List<Any?>?) {
+
+        holder.bind(this)
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/NoResultsException.kt

@@ -1,3 +0,0 @@
-package eu.kanade.tachiyomi.ui.catalogue
-
-class NoResultsException : Exception()

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceDividerItemDecoration.kt

@@ -0,0 +1,47 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.support.v7.widget.RecyclerView
+import android.view.View
+
+class SourceDividerItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
+
+    private val divider: Drawable
+
+    init {
+        val a = context.obtainStyledAttributes(ATTRS)
+        divider = a.getDrawable(0)
+        a.recycle()
+    }
+
+    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        val left = parent.paddingLeft + SourceHolder.margin
+        val right = parent.width - parent.paddingRight - SourceHolder.margin
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount - 1) {
+            val child = parent.getChildAt(i)
+            if (parent.getChildViewHolder(child) is SourceHolder &&
+                    parent.getChildViewHolder(parent.getChildAt(i + 1)) is SourceHolder) {
+                val params = child.layoutParams as RecyclerView.LayoutParams
+                val top = child.bottom + params.bottomMargin
+                val bottom = top + divider.intrinsicHeight
+
+                divider.setBounds(left, top, right, bottom)
+                divider.draw(c)
+            }
+        }
+    }
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView,
+                                state: RecyclerView.State) {
+        outRect.set(0, 0, 0, divider.intrinsicHeight)
+    }
+
+    companion object {
+        private val ATTRS = intArrayOf(android.R.attr.listDivider)
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceHolder.kt

@@ -0,0 +1,105 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import android.os.Build
+import android.view.View
+import android.view.ViewGroup
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.online.LoginSource
+import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import eu.kanade.tachiyomi.util.dpToPx
+import eu.kanade.tachiyomi.util.getRound
+import eu.kanade.tachiyomi.util.gone
+import eu.kanade.tachiyomi.util.visible
+import io.github.mthli.slice.Slice
+import kotlinx.android.synthetic.main.catalogue_main_controller_card_item.*
+
+class SourceHolder(view: View, adapter: CatalogueAdapter) : BaseFlexibleViewHolder(view, adapter) {
+
+    private val slice = Slice(card).apply {
+        setColor(adapter.cardBackground)
+    }
+
+    init {
+        source_browse.setOnClickListener {
+            adapter.browseClickListener.onBrowseClick(adapterPosition)
+        }
+
+        source_latest.setOnClickListener {
+            adapter.latestClickListener.onLatestClick(adapterPosition)
+        }
+    }
+
+    fun bind(item: SourceItem) {
+        val source = item.source
+        setCardEdges(item)
+
+        // Set source name
+        title.text = source.name
+
+        // Set circle letter image.
+        itemView.post {
+            image.setImageDrawable(image.getRound(source.name.take(1).toUpperCase(),false))
+        }
+
+        // If source is login, show only login option
+        if (source is LoginSource && !source.isLogged()) {
+            source_browse.setText(R.string.login)
+            source_latest.gone()
+        } else {
+            source_browse.setText(R.string.browse)
+            source_latest.visible()
+        }
+    }
+
+    private fun setCardEdges(item: SourceItem) {
+        // Position of this item in its header. Defaults to 0 when header is null.
+        var position = 0
+
+        // Number of items in the header of this item. Defaults to 1 when header is null.
+        var count = 1
+
+        if (item.header != null) {
+            val sectionItems = mAdapter.getSectionItems(item.header)
+            position = sectionItems.indexOf(item)
+            count = sectionItems.size
+        }
+
+        when {
+            // Only one item in the card
+            count == 1 -> applySlice(2f, false, false, true, true)
+            // First item of the card
+            position == 0 -> applySlice(2f, false, true, true, false)
+            // Last item of the card
+            position == count - 1 -> applySlice(2f, true, false, false, true)
+            // Middle item
+            else -> applySlice(0f, false, false, false, false)
+        }
+    }
+
+    private fun applySlice(radius: Float, topRect: Boolean, bottomRect: Boolean,
+                           topShadow: Boolean, bottomShadow: Boolean) {
+
+        slice.setRadius(radius)
+        slice.showLeftTopRect(topRect)
+        slice.showRightTopRect(topRect)
+        slice.showLeftBottomRect(bottomRect)
+        slice.showRightBottomRect(bottomRect)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            slice.showTopEdgeShadow(topShadow)
+            slice.showBottomEdgeShadow(bottomShadow)
+        }
+        setMargins(margin, if (topShadow) margin else 0, margin, if (bottomShadow) margin else 0)
+    }
+
+    private fun setMargins(left: Int, top: Int, right: Int, bottom: Int) {
+        val v = card
+        if (v.layoutParams is ViewGroup.MarginLayoutParams) {
+            val p = v.layoutParams as ViewGroup.MarginLayoutParams
+            p.setMargins(left, top, right, bottom)
+        }
+    }
+
+    companion object {
+        val margin = 8.dpToPx
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/SourceItem.kt

@@ -0,0 +1,41 @@
+package eu.kanade.tachiyomi.ui.catalogue
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractSectionableItem
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.CatalogueSource
+
+/**
+ * Item that contains source information.
+ *
+ * @param source Instance of [CatalogueSource] containing source information.
+ * @param header The header for this item.
+ */
+data class SourceItem(val source: CatalogueSource, val header: LangItem? = null) :
+        AbstractSectionableItem<SourceHolder, LangItem>(header) {
+
+    /**
+     * Returns the layout resource of this item.
+     */
+    override fun getLayoutRes(): Int {
+        return R.layout.catalogue_main_controller_card_item
+    }
+
+    /**
+     * Creates a new view holder for this item.
+     */
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): SourceHolder {
+        return SourceHolder(view, adapter as CatalogueAdapter)
+    }
+
+    /**
+     * Binds this item to the given view holder.
+     */
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: SourceHolder,
+                                position: Int, payloads: List<Any?>?) {
+
+        holder.bind(this)
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt

@@ -0,0 +1,520 @@
+package eu.kanade.tachiyomi.ui.catalogue.browse
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.support.design.widget.Snackbar
+import android.support.v4.widget.DrawerLayout
+import android.support.v7.widget.*
+import android.view.*
+import com.afollestad.materialdialogs.MaterialDialog
+import com.f2prateek.rx.preferences.Preference
+import com.jakewharton.rxbinding.support.v7.widget.queryTextChangeEvents
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.SecondaryDrawerController
+import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
+import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
+import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.util.*
+import eu.kanade.tachiyomi.widget.AutofitRecyclerView
+import eu.kanade.tachiyomi.widget.DrawerSwipeCloseListener
+import kotlinx.android.synthetic.main.catalogue_controller.*
+import kotlinx.android.synthetic.main.main_activity.*
+import rx.Observable
+import rx.Subscription
+import rx.android.schedulers.AndroidSchedulers
+import rx.subscriptions.Subscriptions
+import timber.log.Timber
+import uy.kohesive.injekt.injectLazy
+import java.util.concurrent.TimeUnit
+
+/**
+ * Controller to manage the catalogues available in the app.
+ */
+open class BrowseCatalogueController(bundle: Bundle) :
+        NucleusController<BrowseCataloguePresenter>(bundle),
+        SecondaryDrawerController,
+        FlexibleAdapter.OnItemClickListener,
+        FlexibleAdapter.OnItemLongClickListener,
+        FlexibleAdapter.EndlessScrollListener,
+        ChangeMangaCategoriesDialog.Listener {
+
+    constructor(source: CatalogueSource) : this(Bundle().apply {
+        putLong(SOURCE_ID_KEY, source.id)
+    })
+
+    /**
+     * Preferences helper.
+     */
+    private val preferences: PreferencesHelper by injectLazy()
+
+    /**
+     * Adapter containing the list of manga from the catalogue.
+     */
+    private var adapter: FlexibleAdapter<IFlexible<*>>? = null
+
+    /**
+     * Snackbar containing an error message when a request fails.
+     */
+    private var snack: Snackbar? = null
+
+    /**
+     * Navigation view containing filter items.
+     */
+    private var navView: CatalogueNavigationView? = null
+
+    /**
+     * Recycler view with the list of results.
+     */
+    private var recycler: RecyclerView? = null
+
+    /**
+     * Drawer listener to allow swipe only for closing the drawer.
+     */
+    private var drawerListener: DrawerLayout.DrawerListener? = null
+
+    /**
+     * Subscription for the search view.
+     */
+    private var searchViewSubscription: Subscription? = null
+
+    /**
+     * Subscription for the number of manga per row.
+     */
+    private var numColumnsSubscription: Subscription? = null
+
+    /**
+     * Endless loading item.
+     */
+    private var progressItem: ProgressItem? = null
+
+    init {
+        setHasOptionsMenu(true)
+    }
+
+    override fun getTitle(): String? {
+        return presenter.source.name
+    }
+
+    override fun createPresenter(): BrowseCataloguePresenter {
+        return BrowseCataloguePresenter(args.getLong(SOURCE_ID_KEY))
+    }
+
+    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
+        return inflater.inflate(R.layout.catalogue_controller, container, false)
+    }
+
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
+
+        // Initialize adapter, scroll listener and recycler views
+        adapter = FlexibleAdapter(null, this)
+        setupRecycler(view)
+
+        navView?.setFilters(presenter.filterItems)
+
+        progress?.visible()
+    }
+
+    override fun onDestroyView(view: View) {
+        numColumnsSubscription?.unsubscribe()
+        numColumnsSubscription = null
+        searchViewSubscription?.unsubscribe()
+        searchViewSubscription = null
+        adapter = null
+        snack = null
+        recycler = null
+        super.onDestroyView(view)
+    }
+
+    override fun createSecondaryDrawer(drawer: DrawerLayout): ViewGroup? {
+        // Inflate and prepare drawer
+        val navView = drawer.inflate(R.layout.catalogue_drawer) as CatalogueNavigationView
+        this.navView = navView
+        drawerListener = DrawerSwipeCloseListener(drawer, navView).also {
+            drawer.addDrawerListener(it)
+        }
+        navView.setFilters(presenter.filterItems)
+
+        drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.END)
+
+        navView.onSearchClicked = {
+            val allDefault = presenter.sourceFilters == presenter.source.getFilterList()
+            showProgressBar()
+            adapter?.clear()
+            presenter.setSourceFilter(if (allDefault) FilterList() else presenter.sourceFilters)
+        }
+
+        navView.onResetClicked = {
+            presenter.appliedFilters = FilterList()
+            val newFilters = presenter.source.getFilterList()
+            presenter.sourceFilters = newFilters
+            navView.setFilters(presenter.filterItems)
+        }
+        return navView
+    }
+
+    override fun cleanupSecondaryDrawer(drawer: DrawerLayout) {
+        drawerListener?.let { drawer.removeDrawerListener(it) }
+        drawerListener = null
+        navView = null
+    }
+
+    private fun setupRecycler(view: View) {
+        numColumnsSubscription?.unsubscribe()
+
+        var oldPosition = RecyclerView.NO_POSITION
+            val oldRecycler = catalogue_view?.getChildAt(1)
+            if (oldRecycler is RecyclerView) {
+                oldPosition = (oldRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
+                oldRecycler.adapter = null
+
+                catalogue_view?.removeView(oldRecycler)
+            }
+
+        val recycler = if (presenter.isListMode) {
+            RecyclerView(view.context).apply {
+                id = R.id.recycler
+                layoutManager = LinearLayoutManager(context)
+                addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
+            }
+        } else {
+            (catalogue_view.inflate(R.layout.catalogue_recycler_autofit) as AutofitRecyclerView).apply {
+                numColumnsSubscription = getColumnsPreferenceForCurrentOrientation().asObservable()
+                        .doOnNext { spanCount = it }
+                        .skip(1)
+                        // Set again the adapter to recalculate the covers height
+                        .subscribe { adapter = this@BrowseCatalogueController.adapter }
+
+                (layoutManager as GridLayoutManager).spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+                    override fun getSpanSize(position: Int): Int {
+                        return when (adapter?.getItemViewType(position)) {
+                            R.layout.catalogue_grid_item, null -> 1
+                            else -> spanCount
+                        }
+                    }
+                }
+            }
+        }
+        recycler.setHasFixedSize(true)
+        recycler.adapter = adapter
+
+        catalogue_view.addView(recycler, 1)
+
+        if (oldPosition != RecyclerView.NO_POSITION) {
+            recycler.layoutManager.scrollToPosition(oldPosition)
+        }
+        this.recycler = recycler
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.catalogue_list, menu)
+
+        // Initialize search menu
+        menu.findItem(R.id.action_search).apply {
+            val searchView = actionView as SearchView
+
+            val query = presenter.query
+            if (!query.isBlank()) {
+                expandActionView()
+                searchView.setQuery(query, true)
+                searchView.clearFocus()
+            }
+
+            val searchEventsObservable = searchView.queryTextChangeEvents()
+                    .skip(1)
+                    .share()
+            val writingObservable = searchEventsObservable
+                    .filter { !it.isSubmitted }
+                    .debounce(1250, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
+            val submitObservable = searchEventsObservable
+                    .filter { it.isSubmitted }
+
+            searchViewSubscription?.unsubscribe()
+            searchViewSubscription = Observable.merge(writingObservable, submitObservable)
+                    .map { it.queryText().toString() }
+                    .distinctUntilChanged()
+                    .subscribeUntilDestroy { searchWithQuery(it) }
+
+            untilDestroySubscriptions.add(
+                    Subscriptions.create { if (isActionViewExpanded) collapseActionView() })
+        }
+
+        // Setup filters button
+        menu.findItem(R.id.action_set_filter).apply {
+            icon.mutate()
+            if (presenter.sourceFilters.isEmpty()) {
+                isEnabled = false
+                icon.alpha = 128
+            } else {
+                isEnabled = true
+                icon.alpha = 255
+            }
+        }
+
+        // Show next display mode
+        menu.findItem(R.id.action_display_mode).apply {
+            val icon = if (presenter.isListMode)
+                R.drawable.ic_view_module_white_24dp
+            else
+                R.drawable.ic_view_list_white_24dp
+            setIcon(icon)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_display_mode -> swapDisplayMode()
+            R.id.action_set_filter -> navView?.let { activity?.drawer?.openDrawer(Gravity.END) }
+            else -> return super.onOptionsItemSelected(item)
+        }
+        return true
+    }
+
+    /**
+     * Restarts the request with a new query.
+     *
+     * @param newQuery the new query.
+     */
+    private fun searchWithQuery(newQuery: String) {
+        // If text didn't change, do nothing
+        if (presenter.query == newQuery)
+            return
+
+        // FIXME dirty fix to restore the toolbar buttons after closing search mode.
+        if (newQuery == "") {
+            activity?.invalidateOptionsMenu()
+        }
+
+        showProgressBar()
+        adapter?.clear()
+
+        presenter.restartPager(newQuery)
+    }
+
+    /**
+     * Called from the presenter when the network request is received.
+     *
+     * @param page the current page.
+     * @param mangas the list of manga of the page.
+     */
+    fun onAddPage(page: Int, mangas: List<CatalogueItem>) {
+        val adapter = adapter ?: return
+        hideProgressBar()
+        if (page == 1) {
+            adapter.clear()
+            resetProgressItem()
+        }
+        adapter.onLoadMoreComplete(mangas)
+    }
+
+    /**
+     * Called from the presenter when the network request fails.
+     *
+     * @param error the error received.
+     */
+    fun onAddPageError(error: Throwable) {
+        Timber.e(error)
+        val adapter = adapter ?: return
+        adapter.onLoadMoreComplete(null)
+        hideProgressBar()
+
+        val message = if (error is NoResultsException) "No results found" else (error.message ?: "")
+
+        snack?.dismiss()
+        snack = catalogue_view?.snack(message, Snackbar.LENGTH_INDEFINITE) {
+            setAction(R.string.action_retry) {
+                // If not the first page, show bottom progress bar.
+                if (adapter.mainItemCount > 0) {
+                    val item = progressItem ?: return@setAction
+                    adapter.addScrollableFooterWithDelay(item, 0, true)
+                } else {
+                    showProgressBar()
+                }
+                presenter.requestNext()
+            }
+        }
+    }
+
+    /**
+     * Sets a new progress item and reenables the scroll listener.
+     */
+    private fun resetProgressItem() {
+        progressItem = ProgressItem()
+        adapter?.endlessTargetCount = 0
+        adapter?.setEndlessScrollListener(this, progressItem!!)
+    }
+
+    /**
+     * Called by the adapter when scrolled near the bottom.
+     */
+    override fun onLoadMore(lastPosition: Int, currentPage: Int) {
+        if (presenter.hasNextPage()) {
+            presenter.requestNext()
+        } else {
+            adapter?.onLoadMoreComplete(null)
+            adapter?.endlessTargetCount = 1
+        }
+    }
+
+    override fun noMoreLoad(newItemsSize: Int) {
+    }
+
+    /**
+     * Called from the presenter when a manga is initialized.
+     *
+     * @param manga the manga initialized
+     */
+    fun onMangaInitialized(manga: Manga) {
+        getHolder(manga)?.setImage(manga)
+    }
+
+    /**
+     * Swaps the current display mode.
+     */
+    fun swapDisplayMode() {
+        val view = view ?: return
+        val adapter = adapter ?: return
+
+        presenter.swapDisplayMode()
+        val isListMode = presenter.isListMode
+        activity?.invalidateOptionsMenu()
+        setupRecycler(view)
+        if (!isListMode || !view.context.connectivityManager.isActiveNetworkMetered) {
+            // Initialize mangas if going to grid view or if over wifi when going to list view
+            val mangas = (0 until adapter.itemCount).mapNotNull {
+                (adapter.getItem(it) as? CatalogueItem)?.manga
+            }
+            presenter.initializeMangas(mangas)
+        }
+    }
+
+    /**
+     * Returns a preference for the number of manga per row based on the current orientation.
+     *
+     * @return the preference.
+     */
+    fun getColumnsPreferenceForCurrentOrientation(): Preference<Int> {
+        return if (resources?.configuration?.orientation == Configuration.ORIENTATION_PORTRAIT)
+            preferences.portraitColumns()
+        else
+            preferences.landscapeColumns()
+    }
+
+    /**
+     * Returns the view holder for the given manga.
+     *
+     * @param manga the manga to find.
+     * @return the holder of the manga or null if it's not bound.
+     */
+    private fun getHolder(manga: Manga): CatalogueHolder? {
+        val adapter = adapter ?: return null
+
+        adapter.allBoundViewHolders.forEach { holder ->
+            val item = adapter.getItem(holder.adapterPosition) as? CatalogueItem
+            if (item != null && item.manga.id!! == manga.id!!) {
+                return holder as CatalogueHolder
+            }
+        }
+
+        return null
+    }
+
+    /**
+     * Shows the progress bar.
+     */
+    private fun showProgressBar() {
+        progress?.visible()
+        snack?.dismiss()
+        snack = null
+    }
+
+    /**
+     * Hides active progress bars.
+     */
+    private fun hideProgressBar() {
+        progress?.gone()
+    }
+
+    /**
+     * Called when a manga is clicked.
+     *
+     * @param position the position of the element clicked.
+     * @return true if the item should be selected, false otherwise.
+     */
+    override fun onItemClick(position: Int): Boolean {
+        val item = adapter?.getItem(position) as? CatalogueItem ?: return false
+        router.pushController(MangaController(item.manga, true).withFadeTransaction())
+
+        return false
+    }
+
+    /**
+     * Called when a manga is long clicked.
+     *
+     * Adds the manga to the default category if none is set it shows a list of categories for the user to put the manga
+     * in, the list consists of the default category plus the user's categories. The default category is preselected on
+     * new manga, and on already favorited manga the manga's categories are preselected.
+     *
+     * @param position the position of the element clicked.
+     */
+    override fun onItemLongClick(position: Int) {
+        val activity = activity ?: return
+        val manga = (adapter?.getItem(position) as? CatalogueItem?)?.manga ?: return
+        if (manga.favorite) {
+            MaterialDialog.Builder(activity)
+                    .items(activity.getString(R.string.remove_from_library))
+                    .itemsCallback { _, _, which, _ ->
+                        when (which) {
+                            0 -> {
+                                presenter.changeMangaFavorite(manga)
+                                adapter?.notifyItemChanged(position)
+                            }
+                        }
+                    }.show()
+        } else {
+            presenter.changeMangaFavorite(manga)
+            adapter?.notifyItemChanged(position)
+
+            val categories = presenter.getCategories()
+            val defaultCategory = categories.find { it.id == preferences.defaultCategory() }
+            if (defaultCategory != null) {
+                presenter.moveMangaToCategory(manga, defaultCategory)
+            } else if (categories.size <= 1) { // default or the one from the user
+                presenter.moveMangaToCategory(manga, categories.firstOrNull())
+            } else {
+                val ids = presenter.getMangaCategoryIds(manga)
+                val preselected = ids.mapNotNull { id ->
+                    categories.indexOfFirst { it.id == id }.takeIf { it != -1 }
+                }.toTypedArray()
+
+                ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
+                        .showDialog(router)
+            }
+        }
+
+    }
+
+    /**
+     * Update manga to use selected categories.
+     *
+     * @param mangas The list of manga to move to categories.
+     * @param categories The list of categories where manga will be placed.
+     */
+    override fun updateCategoriesForMangas(mangas: List<Manga>, categories: List<Category>) {
+        val manga = mangas.firstOrNull() ?: return
+        presenter.updateMangaCategories(manga, categories)
+    }
+
+    protected companion object {
+        const val SOURCE_ID_KEY = "sourceId"
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCataloguePresenter.kt

@@ -0,0 +1,376 @@
+package eu.kanade.tachiyomi.ui.catalogue.browse
+
+import android.os.Bundle
+import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.flexibleadapter.items.ISectionable
+import eu.kanade.tachiyomi.data.cache.CoverCache
+import eu.kanade.tachiyomi.data.database.DatabaseHelper
+import eu.kanade.tachiyomi.data.database.models.Category
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.models.MangaCategory
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+import eu.kanade.tachiyomi.ui.catalogue.filter.*
+import rx.Observable
+import rx.Subscription
+import rx.android.schedulers.AndroidSchedulers
+import rx.schedulers.Schedulers
+import rx.subjects.PublishSubject
+import timber.log.Timber
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+/**
+ * Presenter of [BrowseCatalogueController].
+ */
+open class BrowseCataloguePresenter(
+        sourceId: Long,
+        sourceManager: SourceManager = Injekt.get(),
+        private val db: DatabaseHelper = Injekt.get(),
+        private val prefs: PreferencesHelper = Injekt.get(),
+        private val coverCache: CoverCache = Injekt.get()
+) : BasePresenter<BrowseCatalogueController>() {
+
+    /**
+     * Selected source.
+     */
+    val source = sourceManager.get(sourceId) as CatalogueSource
+
+    /**
+     * Query from the view.
+     */
+    var query = ""
+        private set
+
+    /**
+     * Modifiable list of filters.
+     */
+    var sourceFilters = FilterList()
+        set(value) {
+            field = value
+            filterItems = value.toItems()
+        }
+
+    var filterItems: List<IFlexible<*>> = emptyList()
+
+    /**
+     * List of filters used by the [Pager]. If empty alongside [query], the popular query is used.
+     */
+    var appliedFilters = FilterList()
+
+    /**
+     * Pager containing a list of manga results.
+     */
+    private lateinit var pager: Pager
+
+    /**
+     * Subject that initializes a list of manga.
+     */
+    private val mangaDetailSubject = PublishSubject.create<List<Manga>>()
+
+    /**
+     * Whether the view is in list mode or not.
+     */
+    var isListMode: Boolean = false
+        private set
+
+    /**
+     * Subscription for the pager.
+     */
+    private var pagerSubscription: Subscription? = null
+
+    /**
+     * Subscription for one request from the pager.
+     */
+    private var pageSubscription: Subscription? = null
+
+    /**
+     * Subscription to initialize manga details.
+     */
+    private var initializerSubscription: Subscription? = null
+
+    override fun onCreate(savedState: Bundle?) {
+        super.onCreate(savedState)
+
+        sourceFilters = source.getFilterList()
+
+        if (savedState != null) {
+            query = savedState.getString(::query.name, "")
+        }
+
+        add(prefs.catalogueAsList().asObservable()
+                .subscribe { setDisplayMode(it) })
+
+        restartPager()
+    }
+
+    override fun onSave(state: Bundle) {
+        state.putString(::query.name, query)
+        super.onSave(state)
+    }
+
+    /**
+     * Restarts the pager for the active source with the provided query and filters.
+     *
+     * @param query the query.
+     * @param filters the current state of the filters (for search mode).
+     */
+    fun restartPager(query: String = this.query, filters: FilterList = this.appliedFilters) {
+        this.query = query
+        this.appliedFilters = filters
+
+        subscribeToMangaInitializer()
+
+        // Create a new pager.
+        pager = createPager(query, filters)
+
+        val sourceId = source.id
+
+        val catalogueAsList = prefs.catalogueAsList()
+
+        // Prepare the pager.
+        pagerSubscription?.let { remove(it) }
+        pagerSubscription = pager.results()
+                .observeOn(Schedulers.io())
+                .map { it.first to it.second.map { networkToLocalManga(it, sourceId) } }
+                .doOnNext { initializeMangas(it.second) }
+                .map { it.first to it.second.map { CatalogueItem(it, catalogueAsList) } }
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeReplay({ view, (page, mangas) ->
+                    view.onAddPage(page, mangas)
+                }, { _, error ->
+                    Timber.e(error)
+                })
+
+        // Request first page.
+        requestNext()
+    }
+
+    /**
+     * Requests the next page for the active pager.
+     */
+    fun requestNext() {
+        if (!hasNextPage()) return
+
+        pageSubscription?.let { remove(it) }
+        pageSubscription = Observable.defer { pager.requestNext() }
+                .subscribeFirst({ _, _ ->
+                    // Nothing to do when onNext is emitted.
+                }, BrowseCatalogueController::onAddPageError)
+    }
+
+    /**
+     * Returns true if the last fetched page has a next page.
+     */
+    fun hasNextPage(): Boolean {
+        return pager.hasNextPage
+    }
+
+    /**
+     * Sets the display mode.
+     *
+     * @param asList whether the current mode is in list or not.
+     */
+    private fun setDisplayMode(asList: Boolean) {
+        isListMode = asList
+        subscribeToMangaInitializer()
+    }
+
+    /**
+     * Subscribes to the initializer of manga details and updates the view if needed.
+     */
+    private fun subscribeToMangaInitializer() {
+        initializerSubscription?.let { remove(it) }
+        initializerSubscription = mangaDetailSubject.observeOn(Schedulers.io())
+                .flatMap { Observable.from(it) }
+                .filter { it.thumbnail_url == null && !it.initialized }
+                .concatMap { getMangaDetailsObservable(it) }
+                .onBackpressureBuffer()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({ manga ->
+                    @Suppress("DEPRECATION")
+                    view?.onMangaInitialized(manga)
+                }, { error ->
+                    Timber.e(error)
+                })
+                .apply { add(this) }
+    }
+
+    /**
+     * Returns a manga from the database for the given manga from network. It creates a new entry
+     * if the manga is not yet in the database.
+     *
+     * @param sManga the manga from the source.
+     * @return a manga from the database.
+     */
+    private fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {
+        var localManga = db.getManga(sManga.url, sourceId).executeAsBlocking()
+        if (localManga == null) {
+            val newManga = Manga.create(sManga.url, sManga.title, sourceId)
+            newManga.copyFrom(sManga)
+            val result = db.insertManga(newManga).executeAsBlocking()
+            newManga.id = result.insertedId()
+            localManga = newManga
+        }
+        return localManga
+    }
+
+    /**
+     * Initialize a list of manga.
+     *
+     * @param mangas the list of manga to initialize.
+     */
+    fun initializeMangas(mangas: List<Manga>) {
+        mangaDetailSubject.onNext(mangas)
+    }
+
+    /**
+     * Returns an observable of manga that initializes the given manga.
+     *
+     * @param manga the manga to initialize.
+     * @return an observable of the manga to initialize
+     */
+    private fun getMangaDetailsObservable(manga: Manga): Observable<Manga> {
+        return source.fetchMangaDetails(manga)
+                .flatMap { networkManga ->
+                    manga.copyFrom(networkManga)
+                    manga.initialized = true
+                    db.insertManga(manga).executeAsBlocking()
+                    Observable.just(manga)
+                }
+                .onErrorResumeNext { Observable.just(manga) }
+    }
+
+    /**
+     * Adds or removes a manga from the library.
+     *
+     * @param manga the manga to update.
+     */
+    fun changeMangaFavorite(manga: Manga) {
+        manga.favorite = !manga.favorite
+        if (!manga.favorite) {
+            coverCache.deleteFromCache(manga.thumbnail_url)
+        }
+        db.insertManga(manga).executeAsBlocking()
+    }
+
+    /**
+     * Changes the active display mode.
+     */
+    fun swapDisplayMode() {
+        prefs.catalogueAsList().set(!isListMode)
+    }
+
+    /**
+     * Set the filter states for the current source.
+     *
+     * @param filters a list of active filters.
+     */
+    fun setSourceFilter(filters: FilterList) {
+        restartPager(filters = filters)
+    }
+
+    open fun createPager(query: String, filters: FilterList): Pager {
+        return CataloguePager(source, query, filters)
+    }
+
+    private fun FilterList.toItems(): List<IFlexible<*>> {
+        return mapNotNull {
+            when (it) {
+                is Filter.Header -> HeaderItem(it)
+                is Filter.Separator -> SeparatorItem(it)
+                is Filter.CheckBox -> CheckboxItem(it)
+                is Filter.TriState -> TriStateItem(it)
+                is Filter.Text -> TextItem(it)
+                is Filter.Select<*> -> SelectItem(it)
+                is Filter.Group<*> -> {
+                    val group = GroupItem(it)
+                    val subItems = it.state.mapNotNull {
+                        when (it) {
+                            is Filter.CheckBox -> CheckboxSectionItem(it)
+                            is Filter.TriState -> TriStateSectionItem(it)
+                            is Filter.Text -> TextSectionItem(it)
+                            is Filter.Select<*> -> SelectSectionItem(it)
+                            else -> null
+                        } as? ISectionable<*, *>
+                    }
+                    subItems.forEach { it.header = group }
+                    group.subItems = subItems
+                    group
+                }
+                is Filter.Sort -> {
+                    val group = SortGroup(it)
+                    val subItems = it.values.map {
+                        SortItem(it, group)
+                    }
+                    group.subItems = subItems
+                    group
+                }
+            }
+        }
+    }
+
+    /**
+     * Get the default, and user categories.
+     *
+     * @return List of categories, default plus user categories
+     */
+    fun getCategories(): List<Category> {
+        return db.getCategories().executeAsBlocking()
+    }
+
+    /**
+     * Gets the category id's the manga is in, if the manga is not in a category, returns the default id.
+     *
+     * @param manga the manga to get categories from.
+     * @return Array of category ids the manga is in, if none returns default id
+     */
+    fun getMangaCategoryIds(manga: Manga): Array<Int?> {
+        val categories = db.getCategoriesForManga(manga).executeAsBlocking()
+        return categories.mapNotNull { it.id }.toTypedArray()
+    }
+
+    /**
+     * Move the given manga to categories.
+     *
+     * @param categories the selected categories.
+     * @param manga the manga to move.
+     */
+    private fun moveMangaToCategories(manga: Manga, categories: List<Category>) {
+        val mc = categories.filter { it.id != 0 }.map { MangaCategory.create(manga, it) }
+        db.setMangaCategories(mc, listOf(manga))
+    }
+
+    /**
+     * Move the given manga to the category.
+     *
+     * @param category the selected category.
+     * @param manga the manga to move.
+     */
+    fun moveMangaToCategory(manga: Manga, category: Category?) {
+        moveMangaToCategories(manga, listOfNotNull(category))
+    }
+
+    /**
+     * Update manga to use selected categories.
+     *
+     * @param manga needed to change
+     * @param selectedCategories selected categories
+     */
+    fun updateMangaCategories(manga: Manga, selectedCategories: List<Category>) {
+        if (!selectedCategories.isEmpty()) {
+            if (!manga.favorite)
+                changeMangaFavorite(manga)
+
+            moveMangaToCategories(manga, selectedCategories.filter { it.id != 0 })
+        } else {
+            changeMangaFavorite(manga)
+        }
+    }
+
+}

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

@@ -1,12 +1,12 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
-import kotlinx.android.synthetic.main.catalogue_grid_item.view.*
+import kotlinx.android.synthetic.main.catalogue_grid_item.*
 
 /**
  * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title.
@@ -27,25 +27,24 @@ class CatalogueGridHolder(private val view: View, private val adapter: FlexibleA
      */
     override fun onSetValues(manga: Manga) {
         // Set manga title
-        view.title.text = manga.title
+        title.text = manga.title
 
         // Set alpha of thumbnail.
-        view.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
+        thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }
 
     override fun setImage(manga: Manga) {
-        Glide.clear(view.thumbnail)
+        GlideApp.with(view.context).clear(thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(view.context)
+            GlideApp.with(view.context)
                     .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
                     .centerCrop()
                     .skipMemoryCache(true)
                     .placeholder(android.R.color.transparent)
-                    .into(StateImageViewTarget(view.thumbnail, view.progress))
+                    .into(StateImageViewTarget(thumbnail, progress))
-
         }
     }
 }

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

@@ -1,9 +1,9 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 
 /**
  * Generic class used to hold the displayed data of a manga in the catalogue.
@@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
  * @param adapter the adapter handling this holder.
  */
 abstract class CatalogueHolder(view: View, adapter: FlexibleAdapter<*>) :
-        FlexibleViewHolder(view, adapter) {
+        BaseFlexibleViewHolder(view, adapter) {
 
     /**
      * Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueItem.kt

@@ -1,39 +1,40 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import android.view.Gravity
-import android.view.LayoutInflater
+import android.view.View
-import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.FrameLayout
+import com.f2prateek.rx.preferences.Preference
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.util.inflate
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.widget.AutofitRecyclerView
 import kotlinx.android.synthetic.main.catalogue_grid_item.view.*
 
-class CatalogueItem(val manga: Manga) : AbstractFlexibleItem<CatalogueHolder>() {
+class CatalogueItem(val manga: Manga, private val catalogueAsList: Preference<Boolean>) :
+        AbstractFlexibleItem<CatalogueHolder>() {
 
     override fun getLayoutRes(): Int {
-        return R.layout.catalogue_grid_item
+        return if (catalogueAsList.getOrDefault())
+            R.layout.catalogue_list_item
+        else
+            R.layout.catalogue_grid_item
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>,
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): CatalogueHolder {
-                                  inflater: LayoutInflater,
+        val parent = adapter.recyclerView
-                                  parent: ViewGroup): CatalogueHolder {
+        return if (parent is AutofitRecyclerView) {
-
+            view.apply {
-        if (parent is AutofitRecyclerView) {
-            val view = parent.inflate(R.layout.catalogue_grid_item).apply {
                 card.layoutParams = FrameLayout.LayoutParams(
                         MATCH_PARENT, parent.itemWidth / 3 * 4)
                 gradient.layoutParams = FrameLayout.LayoutParams(
                         MATCH_PARENT, parent.itemWidth / 3 * 4 / 2, Gravity.BOTTOM)
             }
-            return CatalogueGridHolder(view, adapter)
+            CatalogueGridHolder(view, adapter)
         } else {
-            val view = parent.inflate(R.layout.catalogue_list_item)
+            CatalogueListHolder(view, adapter)
-            return CatalogueListHolder(view, adapter)
         }
     }
 

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

@@ -1,13 +1,12 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import android.view.View
-import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.util.getResourceColor
-import jp.wasabeef.glide.transformations.CropCircleTransformation
+import kotlinx.android.synthetic.main.catalogue_list_item.*
-import kotlinx.android.synthetic.main.catalogue_list_item.view.*
 
 /**
  * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title.
@@ -30,24 +29,24 @@ class CatalogueListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
      * @param manga the manga to bind.
      */
     override fun onSetValues(manga: Manga) {
-        view.title.text = manga.title
+        title.text = manga.title
-        view.title.setTextColor(if (manga.favorite) favoriteColor else unfavoriteColor)
+        title.setTextColor(if (manga.favorite) favoriteColor else unfavoriteColor)
 
         setImage(manga)
     }
 
     override fun setImage(manga: Manga) {
-        Glide.clear(view.thumbnail)
+        GlideApp.with(view.context).clear(thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
-            Glide.with(view.context)
+            GlideApp.with(view.context)
                     .load(manga)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
                     .centerCrop()
-                    .bitmapTransform(CropCircleTransformation(view.context))
+                    .circleCrop()
                     .dontAnimate()
                     .skipMemoryCache(true)
                     .placeholder(android.R.color.transparent)
-                    .into(view.thumbnail)
+                    .into(thumbnail)
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt

@@ -1,40 +1,40 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
-
+
-import android.content.Context
+import android.content.Context
-import android.util.AttributeSet
+import android.util.AttributeSet
-import android.view.ViewGroup
+import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.util.inflate
+import eu.kanade.tachiyomi.util.inflate
-import eu.kanade.tachiyomi.widget.SimpleNavigationView
+import eu.kanade.tachiyomi.widget.SimpleNavigationView
-import kotlinx.android.synthetic.main.catalogue_drawer_content.view.*
+import kotlinx.android.synthetic.main.catalogue_drawer_content.view.*
-
+
-
+
-class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
+class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
-    : SimpleNavigationView(context, attrs) {
+    : SimpleNavigationView(context, attrs) {
-
+
-    val adapter: FlexibleAdapter<IFlexible<*>> = FlexibleAdapter<IFlexible<*>>(null)
+    val adapter: FlexibleAdapter<IFlexible<*>> = FlexibleAdapter<IFlexible<*>>(null)
-            .setDisplayHeadersAtStartUp(true)
+            .setDisplayHeadersAtStartUp(true)
-            .setStickyHeaders(true)
+            .setStickyHeaders(true)
-
+
-    var onSearchClicked = {}
+    var onSearchClicked = {}
-
+
-    var onResetClicked = {}
+    var onResetClicked = {}
-
+
-    init {
+    init {
-        recycler.adapter = adapter
+        recycler.adapter = adapter
-        recycler.setHasFixedSize(true)
+        recycler.setHasFixedSize(true)
-        val view = inflate(R.layout.catalogue_drawer_content)
+        val view = inflate(R.layout.catalogue_drawer_content)
-        ((view as ViewGroup).getChildAt(1) as ViewGroup).addView(recycler)
+        ((view as ViewGroup).getChildAt(1) as ViewGroup).addView(recycler)
-        addView(view)
+        addView(view)
-
+
-        search_btn.setOnClickListener { onSearchClicked() }
+        search_btn.setOnClickListener { onSearchClicked() }
-        reset_btn.setOnClickListener { onResetClicked() }
+        reset_btn.setOnClickListener { onResetClicked() }
-    }
+    }
-
+
-    fun setFilters(items: List<IFlexible<*>>) {
+    fun setFilters(items: List<IFlexible<*>>) {
-        adapter.updateDataSet(items.toMutableList())
+        adapter.updateDataSet(items)
-    }
+    }
-
+
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CataloguePager.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.FilterList

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/NoResultsException.kt

@@ -0,0 +1,3 @@
+package eu.kanade.tachiyomi.ui.catalogue.browse
+
+class NoResultsException : Exception()

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/Pager.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
 import com.jakewharton.rxrelay.PublishRelay
 import eu.kanade.tachiyomi.source.model.MangasPage

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/ProgressItem.kt

@@ -1,30 +1,27 @@
-package eu.kanade.tachiyomi.ui.catalogue
+package eu.kanade.tachiyomi.ui.catalogue.browse
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ProgressBar
 import android.widget.TextView
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 
 
 class ProgressItem : AbstractFlexibleItem<ProgressItem.Holder>() {
 
-    var loadMore = true
+    private var loadMore = true
 
     override fun getLayoutRes(): Int {
         return R.layout.catalogue_progress_item
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: Holder, position: Int, payloads: List<Any?>) {
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>) {
         holder.progressBar.visibility = View.GONE
         holder.progressMessage.visibility = View.GONE
 
@@ -45,8 +42,8 @@ class ProgressItem : AbstractFlexibleItem<ProgressItem.Holder>() {
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val progressBar = view.findViewById(R.id.progress_bar) as ProgressBar
+        val progressBar: ProgressBar = view.findViewById(R.id.progress_bar)
-        val progressMessage = view.findViewById(R.id.progress_message) as TextView
+        val progressMessage: TextView = view.findViewById(R.id.progress_message)
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/CheckboxItem.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.ui.catalogue.filter
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.CheckBox
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -16,8 +14,8 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem<Chec
         return R.layout.navigation_view_checkbox
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -32,10 +30,8 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem<Chec
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is CheckboxItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as CheckboxItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -44,6 +40,6 @@ open class CheckboxItem(val filter: Filter.CheckBox) : AbstractFlexibleItem<Chec
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val check = itemView.findViewById(R.id.nav_view_item) as CheckBox
+        val check: CheckBox = itemView.findViewById(R.id.nav_view_item)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.ui.catalogue.filter
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -19,8 +17,12 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
         return R.layout.navigation_view_group
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun getItemViewType(): Int {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return 101
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -34,10 +36,8 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is GroupItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as GroupItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -46,8 +46,8 @@ class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<Grou
 
     open class Holder(view: View, adapter: FlexibleAdapter<*>) : ExpandableViewHolder(view, adapter, true) {
 
-        val title = itemView.findViewById(R.id.title) as TextView
+        val title: TextView = itemView.findViewById(R.id.title)
-        val icon = itemView.findViewById(R.id.expand_icon) as ImageView
+        val icon: ImageView = itemView.findViewById(R.id.expand_icon)
 
         override fun shouldNotifyParentOnClick(): Boolean {
             return true

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/HeaderItem.kt

@@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.ui.catalogue.filter
 
 import android.annotation.SuppressLint
 import android.support.design.R
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.TextView
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractHeaderItem
@@ -18,8 +16,8 @@ class HeaderItem(val filter: Filter.Header) : AbstractHeaderItem<HeaderItem.Hold
         return R.layout.design_navigation_item_subheader
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -29,10 +27,8 @@ class HeaderItem(val filter: Filter.Header) : AbstractHeaderItem<HeaderItem.Hold
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is HeaderItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as HeaderItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SectionItems.kt

@@ -15,10 +15,8 @@ class TriStateSectionItem(filter: Filter.TriState) : TriStateItem(filter), ISect
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is TriStateSectionItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as TriStateSectionItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -38,10 +36,8 @@ class TextSectionItem(filter: Filter.Text) : TextItem(filter), ISectionable<Text
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is TextSectionItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as TextSectionItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -61,10 +57,8 @@ class CheckboxSectionItem(filter: Filter.CheckBox) : CheckboxItem(filter), ISect
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is CheckboxSectionItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as CheckboxSectionItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -84,10 +78,8 @@ class SelectSectionItem(filter: Filter.Select<*>) : SelectItem(filter), ISection
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is SelectSectionItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as SelectSectionItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SelectItem.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.ui.catalogue.filter
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.TextView
@@ -19,8 +17,8 @@ open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<Selec
         return R.layout.navigation_view_spinner
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -32,18 +30,16 @@ open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<Selec
                 android.R.layout.simple_spinner_item, filter.values).apply {
             setDropDownViewResource(R.layout.common_spinner_item)
         }
-        spinner.onItemSelectedListener = IgnoreFirstSpinnerListener { position ->
+        spinner.onItemSelectedListener = IgnoreFirstSpinnerListener { pos ->
-            filter.state = position
+            filter.state = pos
         }
         spinner.setSelection(filter.state)
     }
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is SelectItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as SelectItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -52,7 +48,7 @@ open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<Selec
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val text = itemView.findViewById(R.id.nav_view_item_text) as TextView
+        val text: TextView = itemView.findViewById(R.id.nav_view_item_text)
-        val spinner = itemView.findViewById(R.id.nav_view_item) as Spinner
+        val spinner: Spinner = itemView.findViewById(R.id.nav_view_item)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SeparatorItem.kt

@@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.ui.catalogue.filter
 
 import android.annotation.SuppressLint
 import android.support.design.R
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.viewholders.FlexibleViewHolder
@@ -17,8 +15,8 @@ class SeparatorItem(val filter: Filter.Separator) : AbstractHeaderItem<Separator
         return R.layout.design_navigation_item_separator
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -27,10 +25,8 @@ class SeparatorItem(val filter: Filter.Separator) : AbstractHeaderItem<Separator
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is SeparatorItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as SeparatorItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt

@@ -1,8 +1,6 @@
 package eu.kanade.tachiyomi.ui.catalogue.filter
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem
 import eu.davidea.flexibleadapter.items.ISectionable
@@ -12,13 +10,16 @@ import eu.kanade.tachiyomi.util.setVectorCompat
 
 class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem<SortGroup.Holder, ISectionable<*, *>>() {
 
-    // Use an id instead of the layout res to allow to reuse the layout.
     override fun getLayoutRes(): Int {
-        return R.id.catalogue_filter_sort_group
+        return R.layout.navigation_view_group
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun getItemViewType(): Int {
-        return Holder(inflater.inflate(R.layout.navigation_view_group, parent, false), adapter)
+        return 100
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -32,10 +33,8 @@ class SortGroup(val filter: Filter.Sort) : AbstractExpandableHeaderItem<SortGrou
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is SortGroup) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as SortGroup).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortItem.kt

@@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.ui.catalogue.filter
 
 import android.support.graphics.drawable.VectorDrawableCompat
 import android.support.v4.content.ContextCompat
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.CheckedTextView
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractSectionableItem
@@ -15,13 +13,16 @@ import eu.kanade.tachiyomi.util.getResourceColor
 
 class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem<SortItem.Holder, SortGroup>(group) {
 
-    // Use an id instead of the layout res to allow to reuse the layout.
     override fun getLayoutRes(): Int {
-        return R.id.catalogue_filter_sort_item
+        return R.layout.navigation_view_checkedtext
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun getItemViewType(): Int {
-        return Holder(inflater.inflate(R.layout.navigation_view_checkedtext, parent, false), adapter)
+        return 102
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -54,10 +55,9 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is SortItem) {
+        if (javaClass != other?.javaClass) return false
-            return name == other.name && group == other.group
+        other as SortItem
-        }
+        return name == other.name && group == other.group
-        return false
     }
 
     override fun hashCode(): Int {
@@ -68,7 +68,7 @@ class SortItem(val name: String, val group: SortGroup) : AbstractSectionableItem
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val text = itemView.findViewById(R.id.nav_view_item) as CheckedTextView
+        val text: CheckedTextView = itemView.findViewById(R.id.nav_view_item)
     }
 
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TextItem.kt

@@ -1,9 +1,7 @@
 package eu.kanade.tachiyomi.ui.catalogue.filter
 
 import android.support.design.widget.TextInputLayout
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.EditText
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -18,8 +16,8 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
         return R.layout.navigation_view_text
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup): Holder {
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -34,10 +32,8 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is TextItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as TextItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -46,7 +42,7 @@ open class TextItem(val filter: Filter.Text) : AbstractFlexibleItem<TextItem.Hol
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val wrapper  = itemView.findViewById(R.id.nav_view_item_wrapper) as TextInputLayout
+        val wrapper: TextInputLayout = itemView.findViewById(R.id.nav_view_item_wrapper)
-        val edit = itemView.findViewById(R.id.nav_view_item) as EditText
+        val edit: EditText = itemView.findViewById(R.id.nav_view_item)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/TriStateItem.kt

@@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.ui.catalogue.filter
 
 import android.support.design.R
 import android.support.graphics.drawable.VectorDrawableCompat
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.CheckedTextView
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -20,8 +18,12 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
         return TR.layout.navigation_view_checkedtext
     }
 
-    override fun createViewHolder(adapter: FlexibleAdapter<*>, inflater: LayoutInflater, parent: ViewGroup?): Holder {
+    override fun getItemViewType(): Int {
-        return Holder(inflater.inflate(layoutRes, parent, false), adapter)
+        return 103
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): Holder {
+        return Holder(view, adapter)
     }
 
     override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: Holder, position: Int, payloads: List<Any?>?) {
@@ -51,10 +53,8 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other is TriStateItem) {
+        if (javaClass != other?.javaClass) return false
-            return filter == other.filter
+        return filter == (other as TriStateItem).filter
-        }
-        return false
     }
 
     override fun hashCode(): Int {
@@ -63,7 +63,7 @@ open class TriStateItem(val filter: Filter.TriState) : AbstractFlexibleItem<TriS
 
     class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
 
-        val text = itemView.findViewById(TR.id.nav_view_item) as CheckedTextView
+        val text: CheckedTextView = itemView.findViewById(TR.id.nav_view_item)
 
         init {
             // Align with native checkbox

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchAdapter.kt

@@ -0,0 +1,74 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.support.v7.widget.RecyclerView
+import android.util.SparseArray
+import eu.davidea.flexibleadapter.FlexibleAdapter
+
+/**
+ * Adapter that holds the search cards.
+ *
+ * @param controller instance of [CatalogueSearchController].
+ */
+class CatalogueSearchAdapter(val controller: CatalogueSearchController) :
+        FlexibleAdapter<CatalogueSearchItem>(null, controller, true) {
+
+    /**
+     * Bundle where the view state of the holders is saved.
+     */
+    private var bundle = Bundle()
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any?>?) {
+        super.onBindViewHolder(holder, position, payloads)
+        restoreHolderState(holder)
+    }
+
+    override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
+        super.onViewRecycled(holder)
+        saveHolderState(holder, bundle)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        val holdersBundle = Bundle()
+        allBoundViewHolders.forEach { saveHolderState(it, holdersBundle) }
+        outState.putBundle(HOLDER_BUNDLE_KEY, holdersBundle)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+        bundle = savedInstanceState.getBundle(HOLDER_BUNDLE_KEY)
+    }
+
+    /**
+     * Saves the view state of the given holder.
+     *
+     * @param holder The holder to save.
+     * @param outState The bundle where the state is saved.
+     */
+    private fun saveHolderState(holder: RecyclerView.ViewHolder, outState: Bundle) {
+        val key = "holder_${holder.adapterPosition}"
+        val holderState = SparseArray<Parcelable>()
+        holder.itemView.saveHierarchyState(holderState)
+        outState.putSparseParcelableArray(key, holderState)
+    }
+
+    /**
+     * Restores the view state of the given holder.
+     *
+     * @param holder The holder to restore.
+     */
+    private fun restoreHolderState(holder: RecyclerView.ViewHolder) {
+        val key = "holder_${holder.adapterPosition}"
+        val holderState = bundle.getSparseParcelableArray<Parcelable>(key)
+        if (holderState != null) {
+            holder.itemView.restoreHierarchyState(holderState)
+            bundle.remove(key)
+        }
+    }
+
+    private companion object {
+        const val HOLDER_BUNDLE_KEY = "holder_bundle"
+    }
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardAdapter.kt

@@ -0,0 +1,27 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.kanade.tachiyomi.data.database.models.Manga
+
+/**
+ * Adapter that holds the manga items from search results.
+ *
+ * @param controller instance of [CatalogueSearchController].
+ */
+class CatalogueSearchCardAdapter(controller: CatalogueSearchController) :
+        FlexibleAdapter<CatalogueSearchCardItem>(null, controller, true) {
+
+    /**
+     * Listen for browse item clicks.
+     */
+    val mangaClickListener: OnMangaClickListener = controller
+
+    /**
+     * Listener which should be called when user clicks browse.
+     * Note: Should only be handled by [CatalogueSearchController]
+     */
+    interface OnMangaClickListener {
+        fun onMangaClick(manga: Manga)
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardHolder.kt

@@ -0,0 +1,43 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.view.View
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.glide.GlideApp
+import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import eu.kanade.tachiyomi.widget.StateImageViewTarget
+import kotlinx.android.synthetic.main.catalogue_global_search_controller_card_item.*
+
+class CatalogueSearchCardHolder(view: View, adapter: CatalogueSearchCardAdapter)
+    : BaseFlexibleViewHolder(view, adapter) {
+
+    init {
+        // Call onMangaClickListener when item is pressed.
+        itemView.setOnClickListener {
+            val item = adapter.getItem(adapterPosition)
+            if (item != null) {
+                adapter.mangaClickListener.onMangaClick(item.manga)
+            }
+        }
+    }
+
+    fun bind(manga: Manga) {
+        tvTitle.text = manga.title
+
+        setImage(manga)
+    }
+
+    fun setImage(manga: Manga) {
+        GlideApp.with(itemView.context).clear(itemImage)
+        if (!manga.thumbnail_url.isNullOrEmpty()) {
+            GlideApp.with(itemView.context)
+                    .load(manga)
+                    .diskCacheStrategy(DiskCacheStrategy.DATA)
+                    .centerCrop()
+                    .skipMemoryCache(true)
+                    .placeholder(android.R.color.transparent)
+                    .into(StateImageViewTarget(itemImage, progress))
+        }
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardItem.kt

@@ -0,0 +1,35 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Manga
+
+class CatalogueSearchCardItem(val manga: Manga) : AbstractFlexibleItem<CatalogueSearchCardHolder>() {
+
+    override fun getLayoutRes(): Int {
+        return R.layout.catalogue_global_search_controller_card_item
+    }
+
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): CatalogueSearchCardHolder {
+        return CatalogueSearchCardHolder(view, adapter as CatalogueSearchCardAdapter)
+    }
+
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: CatalogueSearchCardHolder,
+                                position: Int, payloads: List<Any?>?) {
+        holder.bind(manga)
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other is CatalogueSearchCardItem) {
+            return manga.id == other.manga.id
+        }
+        return false
+    }
+
+    override fun hashCode(): Int {
+        return manga.id?.toInt() ?: 0
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchController.kt

@@ -0,0 +1,178 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.os.Bundle
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.SearchView
+import android.view.*
+import com.jakewharton.rxbinding.support.v7.widget.queryTextChangeEvents
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.source.CatalogueSource
+import eu.kanade.tachiyomi.ui.base.controller.NucleusController
+import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
+import eu.kanade.tachiyomi.ui.manga.MangaController
+import kotlinx.android.synthetic.main.catalogue_global_search_controller.*
+
+/**
+ * This controller shows and manages the different search result in global search.
+ * This controller should only handle UI actions, IO actions should be done by [CatalogueSearchPresenter]
+ * [CatalogueSearchCardAdapter.OnMangaClickListener] called when manga is clicked in global search
+ */
+class CatalogueSearchController(private val initialQuery: String? = null) :
+        NucleusController<CatalogueSearchPresenter>(),
+        CatalogueSearchCardAdapter.OnMangaClickListener {
+
+    /**
+     * Adapter containing search results grouped by lang.
+     */
+    private var adapter: CatalogueSearchAdapter? = null
+
+    /**
+     * Called when controller is initialized.
+     */
+    init {
+        setHasOptionsMenu(true)
+    }
+
+    /**
+     * Initiate the view with [R.layout.catalogue_global_search_controller].
+     *
+     * @param inflater used to load the layout xml.
+     * @param container containing parent views.
+     * @return inflated view
+     */
+    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): android.view.View {
+        return inflater.inflate(R.layout.catalogue_global_search_controller, container, false)
+    }
+
+    /**
+     * Set the title of controller.
+     *
+     * @return title.
+     */
+    override fun getTitle(): String? {
+        return presenter.query
+    }
+
+    /**
+     * Create the [CatalogueSearchPresenter] used in controller.
+     *
+     * @return instance of [CatalogueSearchPresenter]
+     */
+    override fun createPresenter(): CatalogueSearchPresenter {
+        return CatalogueSearchPresenter(initialQuery)
+    }
+
+    /**
+     * Called when manga in global search is clicked, opens manga.
+     *
+     * @param manga clicked item containing manga information.
+     */
+    override fun onMangaClick(manga: Manga) {
+        // Open MangaController.
+        router.pushController(MangaController(manga, true).withFadeTransaction())
+    }
+
+    /**
+     * Adds items to the options menu.
+     *
+     * @param menu menu containing options.
+     * @param inflater used to load the menu xml.
+     */
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        // Inflate menu.
+        inflater.inflate(R.menu.catalogue_new_list, menu)
+
+        // Initialize search menu
+        val searchItem = menu.findItem(R.id.action_search)
+        val searchView = searchItem.actionView as SearchView
+
+        searchItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
+                searchView.onActionViewExpanded() // Required to show the query in the view
+                searchView.setQuery(presenter.query, false)
+                return true
+            }
+
+            override fun onMenuItemActionCollapse(item: MenuItem?): Boolean {
+                return true
+            }
+        })
+
+        searchView.queryTextChangeEvents()
+                .filter { it.isSubmitted }
+                .subscribeUntilDestroy {
+                    presenter.search(it.queryText().toString())
+                    searchItem.collapseActionView()
+                    setTitle() // Update toolbar title
+                }
+    }
+
+    /**
+     * Called when the view is created
+     *
+     * @param view view of controller
+     */
+    override fun onViewCreated(view: View) {
+        super.onViewCreated(view)
+
+        adapter = CatalogueSearchAdapter(this)
+
+        // Create recycler and set adapter.
+        recycler.layoutManager = LinearLayoutManager(view.context)
+        recycler.adapter = adapter
+    }
+
+    override fun onDestroyView(view: View) {
+        adapter = null
+        super.onDestroyView(view)
+    }
+
+    override fun onSaveViewState(view: View, outState: Bundle) {
+        super.onSaveViewState(view, outState)
+        adapter?.onSaveInstanceState(outState)
+    }
+
+    override fun onRestoreViewState(view: View, savedViewState: Bundle) {
+        super.onRestoreViewState(view, savedViewState)
+        adapter?.onRestoreInstanceState(savedViewState)
+    }
+
+    /**
+     * Returns the view holder for the given manga.
+     *
+     * @param source used to find holder containing source
+     * @return the holder of the manga or null if it's not bound.
+     */
+    private fun getHolder(source: CatalogueSource): CatalogueSearchHolder? {
+        val adapter = adapter ?: return null
+
+        adapter.allBoundViewHolders.forEach { holder ->
+            val item = adapter.getItem(holder.adapterPosition)
+            if (item != null && source.id == item.source.id) {
+                return holder as CatalogueSearchHolder
+            }
+        }
+
+        return null
+    }
+
+    /**
+     * Add search result to adapter.
+     *
+     * @param searchResult result of search.
+     */
+    fun setItems(searchResult: List<CatalogueSearchItem>) {
+        adapter?.updateDataSet(searchResult)
+    }
+
+    /**
+     * Called from the presenter when a manga is initialized.
+     *
+     * @param manga the initialized manga.
+     */
+    fun onMangaInitialized(source: CatalogueSource, manga: Manga) {
+        getHolder(source)?.setImage(manga)
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchHolder.kt

@@ -0,0 +1,97 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.support.v7.widget.LinearLayoutManager
+import android.view.View
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import eu.kanade.tachiyomi.util.getResourceColor
+import eu.kanade.tachiyomi.util.gone
+import eu.kanade.tachiyomi.util.setVectorCompat
+import eu.kanade.tachiyomi.util.visible
+import kotlinx.android.synthetic.main.catalogue_global_search_controller_card.*
+
+/**
+ * Holder that binds the [CatalogueSearchItem] containing catalogue cards.
+ *
+ * @param view view of [CatalogueSearchItem]
+ * @param adapter instance of [CatalogueSearchAdapter]
+ */
+class CatalogueSearchHolder(view: View, val adapter: CatalogueSearchAdapter) :
+        BaseFlexibleViewHolder(view, adapter) {
+
+    /**
+     * Adapter containing manga from search results.
+     */
+    private val mangaAdapter = CatalogueSearchCardAdapter(adapter.controller)
+
+    private var lastBoundResults: List<CatalogueSearchCardItem>? = null
+
+    init {
+        // Set layout horizontal.
+        recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
+        recycler.adapter = mangaAdapter
+
+        nothing_found_icon.setVectorCompat(R.drawable.ic_search_black_112dp,
+                view.context.getResourceColor(android.R.attr.textColorHint))
+    }
+
+    /**
+     * Show the loading of source search result.
+     *
+     * @param item item of card.
+     */
+    fun bind(item: CatalogueSearchItem) {
+        val source = item.source
+        val results = item.results
+
+        // Set Title witch country code if available.
+        title.text = if (!source.lang.isEmpty()) "${source.name} (${source.lang})" else source.name
+
+        when {
+            results == null -> {
+                progress.visible()
+                nothing_found.gone()
+            }
+            results.isEmpty() -> {
+                progress.gone()
+                nothing_found.visible()
+            }
+            else -> {
+                progress.gone()
+                nothing_found.gone()
+            }
+        }
+        if (results !== lastBoundResults) {
+            mangaAdapter.updateDataSet(results)
+            lastBoundResults = results
+        }
+    }
+
+    /**
+     * Called from the presenter when a manga is initialized.
+     *
+     * @param manga the initialized manga.
+     */
+    fun setImage(manga: Manga) {
+        getHolder(manga)?.setImage(manga)
+    }
+
+    /**
+     * Returns the view holder for the given manga.
+     *
+     * @param manga the manga to find.
+     * @return the holder of the manga or null if it's not bound.
+     */
+    private fun getHolder(manga: Manga): CatalogueSearchCardHolder? {
+        mangaAdapter.allBoundViewHolders.forEach { holder ->
+            val item = mangaAdapter.getItem(holder.adapterPosition)
+            if (item != null && item.manga.id!! == manga.id!!) {
+                return holder as CatalogueSearchCardHolder
+            }
+        }
+
+        return null
+    }
+
+}

app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchItem.kt

@@ -0,0 +1,64 @@
+package eu.kanade.tachiyomi.ui.catalogue.global_search
+
+import android.view.View
+import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.CatalogueSource
+
+/**
+ * Item that contains search result information.
+ *
+ * @param source contains information about search result.
+ */
+class CatalogueSearchItem(val source: CatalogueSource, val results: List<CatalogueSearchCardItem>?)
+    : AbstractFlexibleItem<CatalogueSearchHolder>() {
+
+    /**
+     * Set view.
+     *
+     * @return id of view
+     */
+    override fun getLayoutRes(): Int {
+        return R.layout.catalogue_global_search_controller_card
+    }
+
+    /**
+     * Create view holder (see [CatalogueSearchAdapter].
+     *
+     * @return holder of view.
+     */
+    override fun createViewHolder(view: View, adapter: FlexibleAdapter<*>): CatalogueSearchHolder {
+        return CatalogueSearchHolder(view, adapter as CatalogueSearchAdapter)
+    }
+
+    /**
+     * Bind item to view.
+     */
+    override fun bindViewHolder(adapter: FlexibleAdapter<*>, holder: CatalogueSearchHolder,
+                                position: Int, payloads: List<Any?>?) {
+        holder.bind(this)
+    }
+
+    /**
+     * Used to check if two items are equal.
+     *
+     * @return items are equal?
+     */
+    override fun equals(other: Any?): Boolean {
+        if (other is CatalogueSearchItem) {
+            return source.id == other.source.id
+        }
+        return false
+    }
+
+    /**
+     * Return hash code of item.
+     *
+     * @return hashcode
+     */
+    override fun hashCode(): Int {
+        return source.id.toInt()
+    }
+
+}