NerdNumber9
3da7c47bf5
Merge branch 'master' of https://github.com/inorichi/tachiyomi
...
# Conflicts:
# app/build.gradle
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/ActivityMixin.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/FlexibleViewHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/adapter/SmartFragmentStatePagerAdapter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/BaseRxFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/base/fragment/FragmentMixin.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesFragment.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/LibraryFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaEvent.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/ChapterCountEvent.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaFavoriteEvent.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/util/AndroidComponentUtil.java
# app/src/main/java/eu/kanade/tachiyomi/widget/preference/LibraryColumnsDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/widget/preference/SimpleDialogPreference.kt
# app/src/main/res/layout/activity_download_manager.xml
# app/src/main/res/layout/activity_edit_categories.xml
# app/src/main/res/layout/activity_manga.xml
# app/src/main/res/layout/activity_preferences.xml
# app/src/main/res/layout/fragment_backup.xml
# app/src/main/res/layout/fragment_download_queue.xml
# app/src/main/res/layout/fragment_library.xml
# app/src/main/res/layout/fragment_library_category.xml
# app/src/main/res/layout/item_chapter.xml
# app/src/main/res/layout/item_recent_chapters.xml
# app/src/main/res/layout/toolbar.xml
# app/src/main/res/raw/changelog_release.xml
# app/src/main/res/values/arrays.xml
# app/src/main/res/xml/pref_about.xml
# app/src/main/res/xml/pref_advanced.xml
# app/src/main/res/xml/pref_downloads.xml
# app/src/main/res/xml/pref_general.xml
# app/src/main/res/xml/pref_reader.xml
# app/src/main/res/xml/pref_sources.xml
# app/src/main/res/xml/pref_tracking.xml
Migrate to Tachiyomi 6.1
Rewrite batch add UI
2017-08-24 11:24:23 -04:00
Carlos
a12a34e3bb
Add Batoto Scanlator to Chapter view ( #789 )
...
* Added scanlator for Batoto on chapter list
* adjusted item_chapter layout for scanlator
adjusted so db chapters get updated if scanlator does not match source scanlator
* adjusted item_chapter layout for scanlator
adjusted chapter holder to dynamically set title max lines depending on if scanlator exists
* fixed excess blank line
* changed scanlator to be instantiated instead lateint to prevent toast message erro when viewing chapters by catalog
* changed item_chapter.xml to constraint layout
* removed accidental changes to catalog
* cleaned up code.
* fixed issue where long title was running into 3 dot menu
fixed issue where no scanlator for manga was causing date to not be bottom lined
fixed general chapter layout to be more similar to existing
* allow scanlator to be null
* fixed merge issue
* fixed merge issue
* attempt to fix whitespace carriage return issue
* attempt to fix whitespace carriage return issue
* attempt to fix whitespace carriage return issue
2017-08-15 15:05:41 +02:00
NerdNumber9
9dbb59f337
Upstream merge
...
Internal permission change
Fix url adder
2017-05-04 23:38:17 -04:00
len
706163e7a6
Move source and network outside data
2017-01-20 21:24:31 +01:00
