Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-06-28 08:16:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
0ac33b64b1
tachiyomi/app/src/main/res
History
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
2020-02-29 17:52:49 -05:00
..
anim Remove unused FAB animations 2020-02-29 13:11:43 -05:00
drawable Unix line endings 2020-02-29 13:03:29 -05:00
drawable-hdpi Remove round icon asset 2020-02-04 22:24:16 -05:00
drawable-mdpi Remove round icon asset 2020-02-04 22:24:16 -05:00
drawable-xhdpi Remove round icon asset 2020-02-04 22:24:16 -05:00
drawable-xxhdpi Remove round icon asset 2020-02-04 22:24:16 -05:00
drawable-xxxhdpi Remove round icon asset 2020-02-04 22:24:16 -05:00
layout Merge branch '0.8.x' 2020-02-29 17:52:49 -05:00
layout-land Add description for secure screen setting 2020-02-26 18:58:13 -05:00
menu Migrate to bottom navigation 2020-02-25 22:31:54 -05:00
mipmap-anydpi-v26 Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
mipmap-hdpi Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
mipmap-mdpi Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
mipmap-xhdpi Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
mipmap-xxhdpi Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
mipmap-xxxhdpi Add adaptive icon and a dev variant 2018-01-13 18:15:00 +01:00
raw Release 0.8.5 2020-02-29 16:42:11 -05:00
values Provide more human readable error when downloading to invalid directory (#2462) 2020-02-29 13:10:55 -05:00
values-ar Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-bg Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-bn Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-ca Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-cs Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-de Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-el Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-es Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-fi Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-fr Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-hi Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-hu Translations (Continuous) (#2484) 2020-01-11 16:39:27 -05:00
values-in Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-it Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-ja Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-ko Translations (#2011) 2019-09-21 09:50:38 -04:00
values-lv Translations (#1593) 2018-09-24 19:50:39 +02:00
values-ms Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-nb-rNO Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-night Dark mode splash screen (closes #2540) 2020-02-18 22:13:45 -05:00
values-nl Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-pl Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-pt Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-pt-rBR Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-ro Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-ru Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-sc Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-sk Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-sr Hide Empty Search Results in Catalogues (#2066) 2019-07-01 13:06:19 +02:00
values-sv Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-th Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-tl Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-tr Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-uk Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-v26 Restrict translucent reader UI to API 26+ (fixes #2580) 2020-02-09 22:59:03 -05:00
values-v28 Add color filter blend modes (#2013) 2019-04-29 19:32:49 +02:00
values-vi Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-w820dp Don't use full-width page sheet on big landscape screens 2018-10-09 13:46:27 +02:00
values-zh-rCN Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
values-zh-rTW Translations (Continuous) (#2485) 2020-02-06 14:43:15 -05:00
xml Run default Android Studio formatter on resources 2020-02-17 17:26:20 -05:00