Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,020 Commits 1 Branch 60 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
arkon
d3b7f639b5 Convert tracker add/update/login methods to coroutines 
(cherry picked from commit ea33179a95597c43f5f158d82eb48d5e5b38e47c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
 2020-12-26 00:36:08 -05:00
arkon
495d63e66b Replace more Kotlin synthetics 
(cherry picked from commit 66e3fa7df8b553e753be0574af347affac88530e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2020-11-29 17:16:20 -05:00
arkon
9d16b0efd2 Replace more Kotlin synthetics 
(cherry picked from commit 019a0f31c767c496bcc569485d5daf57fcc947eb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.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/widget/preference/LoginDialogPreference.kt
 2020-11-29 00:23:09 -05:00
Jobobby04
de05f88d5f Fix Mangadex 2 factor auth 
Fix Backups with merge manga breaking(I think)
Tweak preload settings, make the max 20, defaults to 10
Add tag based sorting
 2020-09-15 13:00:40 -04:00
arkon
eb3c9a1d58 Move tracker setting dialogs 
(cherry picked from commit 885552b792e01d15503ef755e8efeceb604fca0f)
 2020-08-04 23:35:31 -04:00
arkon
f7ff794c87 Make extension settings button inline 
(cherry picked from commit ca7373c28b68fb728691b01a0a3c3e9499486c04)
 2020-06-11 19:32:12 -04:00
MCAxiaz
41b68828cd use material password toggle (#3261) 
use material for track search

(cherry picked from commit bccb1229c8dde15402643bc88313bacd176582e2)
 2020-06-07 14:16:58 -04:00
MCAxiaz
80fa7ebe6c String Formatting Fixes (#3118) 
String Formatting Fixes

(cherry picked from commit a20874f6a15f443025367f6ed988ff93a30ccd6c)
 2020-05-09 11:41:45 -04:00
jobobby04
23ac3d18e5 Optimize imports, disallow wildcard imports because of klint, run linter 2020-05-03 01:36:21 -04:00
Rani Sargees
4d8f44ddae merge double upstream 2020-05-02 23:39:46 -04:00
arkon
d593362ba8 Merge sources and extensions into one view 2020-04-27 19:16:46 -04:00
arkon
3f63b320c4 Linting fixes 2020-04-25 14:24:45 -04:00
arkon
dad010a891 Replace some listeners with flowbindings 2020-04-24 19:37:34 -04:00
arkon
932a47a8a7 Update Material Dialogs 2020-04-21 23:33:01 -04:00
arkon
fdc7981d18 Tweak webtoon margin setting 2020-04-10 11:45:30 -04:00
arkon
145a744ce0 Merge branch 'feature/webtoon-margins' of git://github.com/jleehey/tachiyomi into jleehey-feature/webtoon-margins 
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/preference/PreferenceDSL.kt
#	app/src/main/res/values/strings.xml
 2020-04-10 11:14:09 -04:00
arkon
6da350aee6 Minor extension update cleanup, default to on 2020-03-20 22:59:59 -04:00
Jays2Kings
9585f9a1a6
Option to auto check for extension updates (#2680) 
* Option to auto check for extension updates

* Addressing comments

* Added foreground check for extensions

* Added Extension Preference widget
 2020-03-20 22:22:39 -04:00
arkon
3e5a48e5e4 Use actual dialog title for tracker login dialogs 2020-03-15 17:31:36 -04:00
arkon
7d0ea614da Migrate to MaterialComponents themes 2020-03-11 22:59:37 -04:00
arkon
507471e318 Label Kitsu login field as email address instead of username 2020-03-07 22:19:45 -05:00
arkon
4e60a81b36 Remove unused LoginSource 2020-02-27 22:43:48 -05:00
arkon
043e3784e8 Run linter 2020-02-26 18:03:34 -05:00
arkon
3ecc883944 Run default Android Studio formatter on code 2020-02-17 17:23:37 -05:00
arkon
47f5ea881f Reorganize other util files 2020-02-02 22:22:54 -05:00
arkon
13ea1342fb Optimize imports 2020-01-28 22:47:57 -05:00
arkon
98f86a44ef Add tracker logout dialog (closes #2475) 2020-01-19 17:03:11 -05:00
arkon
5cddb269d6 Minor code cleanup 2020-01-07 20:17:07 -05:00
Rani Sargees
9b883b1a09 androidx migration 
I DID THIS ONE MYSELF WITHOUT TAKING IT FROM THE OTHER FORKS
YEEEEEEEEEEET
 2020-01-06 03:26:31 -05:00
arkon
78689e7443
Migrate to AndroidX (#2424) 
* Migrate to AndroidX (automatic conversion by Android Studio)

* AndroidX dependency code updates

* Fix source preference reparenting

* fixes the androidx prefererences icon spacing issue

(cherry picked from commit b76a15d960ec2cdf771be16377db0348b66b3179)

* Fix source preference screen heading size/list padding

Co-authored-by: Carlos <cargo8005@gmail.com>
 2020-01-05 11:29:27 -05:00
John Leehey
4014c48c62 Revert "Remove no-longer-needed FloatListPreference" 
This reverts commit 19993199db400e0276966dacba5511115e907170.
 2019-12-02 13:38:33 -08:00
John Leehey
19993199db Remove no-longer-needed FloatListPreference 2019-11-30 18:41:52 -08:00
John Leehey
5b9f362925 Add support for margins in Webtoon view 
On larger tablets, matching the page width to the screen width in
webtoon mode causes eye strain due to the image looking so magnified.
Adding a page margin to the image can resolve this by effectively
scaling the image down.
 2019-11-30 18:37:52 -08:00
NerdNumber9
5fbe1a8614 Upstream merge 2019-03-31 00:23:44 -04:00
MCAxiaz
9cbf226cfd MAL API Workaround (#1647) 
* Mal API workaround

* remove unused import

* Reuse existing token preference

* Minor code format
 2018-11-11 14:00:47 +01:00
NerdNumber9
a71ae29c98 Add Tsumino captcha display and merge branch 'master' of upstream 
# Conflicts:
#	.github/readme-images/app-icon.png
#	.github/readme-images/screens.png
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java
 2018-02-24 11:13:43 -05:00
Carlos
854112095b Downloading extensions from Github Repo. (#1101) 
Downloading extensions from Github Repo.
 2018-02-05 22:50:56 +01:00
NerdNumber9
908128b55d Merge upstream changes 2017-11-29 21:53:02 -05:00
inorichi
4ae00c80ca Fix many compilation warnings 2017-10-28 19:12:17 +02:00
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
inorichi
ca2236958a Reorganize layouts by feature 2017-05-25 12:16:58 +02:00
inorichi
5914346ace Remove unused classes and arrays resources 2017-05-16 14:11:23 +02:00
inorichi
ff190e02d4 Preferences with conductor (#792) 
* Settings with conductor WIP

* Add downloads preference controller. Implement source/track login

* Improve settings controllers

* Backup settings controller

* Delete preferences xml

* Remove keys from xml

* PreferenceKeys is now an object

* Remove now unused dependency
 2017-05-14 00:45:14 +02:00
NerdNumber9
9dbb59f337 Upstream merge 
Internal permission change
Fix url adder
 2017-05-04 23:38:17 -04:00
len
7425478a55 Optimize imports 2017-01-20 21:34:15 +01:00
len
f807447de1 Rename OnlineSource to HttpSource 2017-01-20 21:27:53 +01:00
len
706163e7a6 Move source and network outside data 2017-01-20 21:24:31 +01:00
len
07cae4d684 Merge and remove util classes 2017-01-08 18:50:51 +01:00
inorichi
dd56d7c0bb Initial support for external sources 2017-01-08 18:12:19 +01:00
len
2b63bae989 Show login errors 2016-12-22 22:11:17 +01:00