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

33 Commits

Author SHA1 Message Date
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
inorichi
94ee4e7fb5 Experimental Anilist and Kitsu support (#586) 
* Tracking tab with anilist support

* Rename MangaSync to Track

* Rename variables and methods to track

* Kitsu implementation

* Variables refactoring

* Travis fix?
 2016-12-18 22:56:28 +01:00
len
2e39be6625 Image is now the default decoder 2016-12-03 16:12:58 +01:00
inorichi
58a2f7a874 Hide catalogues (#466) 
Hide catalogues
 2016-09-18 21:12:12 +02:00
len
f768393a4b Bump dependencies, set target sdk 24 2016-07-30 16:04:43 +02:00
len
9beeca652f Rewrite preferences with a modified support library v7 2016-06-16 20:52:51 +02:00
len
18cdddf433 Minor improvements for sync services 2016-05-31 16:14:32 +02:00
len
6beff242b0 LoginSource moved to an interface 2016-05-28 00:20:59 +02:00
len
0fe350af9a Minor classes restructuration and optimize imports 2016-05-27 13:21:21 +02:00
len
dd5692bb2d Rewrite sources. Implement Batoto and Kissmanga 2016-05-26 10:22:39 +02:00
len
4d65038ad3 Optimize imports 2016-05-15 23:06:11 +02:00
len
bd8b9febd2 Minor changes 2016-04-21 01:04:46 +02:00
len
a7840bc247 Rewrite PreferencesHelper. Allow to customize navigation with volume keys and tapping. Closes #251 and closes #129. 2016-04-18 17:29:46 +02:00
len
67c4781376 Upgrade support library. Switch gradle build tools and AS to 2.0. Adapt code to new support lib 2016-04-08 16:18:41 +02:00
len
4ccce424de Reader view in Kotlin. Upgrade gradle wrapper. Remove ButterKnife from the project 2016-03-18 20:21:30 +01:00
len
f49577bc77 Manga in Kotlin. Expect some errors yet 2016-03-13 22:06:32 +01:00
len
a87c65872c Fix login dialogs not showing the correct title 2016-03-11 16:16:56 +01:00
len
689f2e7fbf Support for sources from different languages 2016-03-10 16:15:48 +01:00
len
05adde552d Kotlinize some widgets 2016-03-08 01:22:56 +01:00
len
70e557575f Preferences ported to support library 2016-03-07 23:48:43 +01:00
inorichi
70f4c7fcc3 Rename project 2016-01-15 15:18:19 +01:00