ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
63e330b83d
tachiyomi/app/src/main/res/layout
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
..
catalogue_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_drawer_content.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_drawer.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_global_search_controller_card_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_global_search_controller_card.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_global_search_controller.xml Replace left/right layout attributes with start/end 2020-01-09 19:10:55 -05:00
catalogue_grid_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_list_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_main_controller_card_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_main_controller_card.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_main_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_progress_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
catalogue_recycler_autofit.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
categories_controller.xml Remove up/down animation for FAB, add list padding (#2456) e411f542 arkon <arkon@users.noreply.github.com> Jan 8, 2020 at 21:33 2020-02-29 13:10:25 -05:00
categories_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
changelog_header_layout.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
changelog_row_layout.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
chapters_controller.xml Remove up/down animation for FAB, add list padding (#2456) e411f542 arkon <arkon@users.noreply.github.com> Jan 8, 2020 at 21:33 2020-02-29 13:10:25 -05:00
chapters_item.xml Add ripple to menu icons 2020-02-27 18:58:36 -05:00
common_dialog_with_checkbox.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
common_listitem_dir.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
common_spinner_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
common_view_empty.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
download_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
download_custom_amount.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
download_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
extension_card_header.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
extension_card_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
extension_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
extension_detail_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
library_category.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
library_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
library_drawer.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
library_grid_recycler.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
library_list_recycler.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
main_activity.xml Always show bottom nav labels 2020-02-27 18:30:51 -05:00
manga_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
manga_info_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
migration_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
navigation_view_checkbox.xml Unix line endings 2020-02-29 13:03:29 -05:00
navigation_view_checkedtext.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
navigation_view_group.xml Unix line endings 2020-02-29 13:03:29 -05:00
navigation_view_radio.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
navigation_view_spinner.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
navigation_view_text.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
pref_account_login.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
pref_item_source.xml Merge branch '0.8.x' 2020-02-29 17:52:49 -05:00
pref_library_columns.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
pref_widget_imageview.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
reader_activity.xml Tweak reader seekbar height for Android 5 UI bug (closes #2487) 2020-02-29 13:12:04 -05:00
reader_color_filter_sheet.xml Add description for secure screen setting 2020-02-26 18:58:13 -05:00
reader_color_filter.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
reader_page_sheet.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
reader_settings_sheet.xml Added Webtoon with Padding viewer (#2618) 2020-02-23 12:44:50 -05:00
recent_chapters_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
recent_chapters_item.xml Add ripple to menu icons 2020-02-27 18:58:36 -05:00
recent_chapters_section_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
recently_read_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
recently_read_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
track_chapters_dialog.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
track_controller.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
track_item.xml Unix line endings 2020-02-29 13:03:29 -05:00
track_score_dialog.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
track_search_dialog.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
track_search_item.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00
webview_activity.xml Run formatter on layout files 2020-02-21 18:43:50 -05:00