arkon
0ac33b64b1
Merge branch '0.8.x'
# Conflicts:
# app/build.gradle
# app/src/main/java/eu/kanade/tachiyomi/data/backup/models/Backup.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/queries/TrackQueries.kt
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/TrackService.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistInterceptor.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/OAuth.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/BangumiApi.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/OAuth.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/OAuth.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/OAuth.kt
# app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt
# app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterJob.kt
# app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
# app/src/main/java/eu/kanade/tachiyomi/network/AndroidCookieJar.kt
# app/src/main/java/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
# app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/network/ProgressListener.kt
# app/src/main/java/eu/kanade/tachiyomi/network/ProgressResponseBody.kt
# app/src/main/java/eu/kanade/tachiyomi/network/Requests.kt
# app/src/main/java/eu/kanade/tachiyomi/source/CatalogueSource.kt
# app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
# app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/Filter.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/FilterList.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/MangasPage.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SChapter.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SChapterImpl.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SMangaImpl.kt
# app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
# app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSourceFetcher.kt
# app/src/main/java/eu/kanade/tachiyomi/source/online/LoginSource.kt
# app/src/main/java/eu/kanade/tachiyomi/source/online/ParsedHttpSource.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NucleusController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/NucleusConductorDelegate.java
# app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/NucleusConductorLifecycleListener.java
# app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/SortGroup.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/global_search/CatalogueSearchCardItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryNavigationView.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChapterItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeletingChaptersDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadChaptersDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetDisplayModeDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetSortingDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/RecentChaptersController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/ExtendedNavigationView.kt
# app/src/main/res/drawable/ic_book_white_24dp.xml
# app/src/main/res/layout/categories_controller.xml
# app/src/main/res/layout/chapters_controller.xml
# app/src/main/res/layout/navigation_view_checkbox.xml
# app/src/main/res/layout/navigation_view_group.xml
# app/src/main/res/layout/pref_item_source.xml
# app/src/main/res/layout/reader_activity.xml
# app/src/main/res/layout/track_item.xml
# app/src/main/res/values/strings.xml
# build.gradle