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
|
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 |
|
Bram van de Kerkhof
|
2118434823
|
Initial AMOLED theme + some CardView fixes (#787)
* Initial AMOLED theme + some CardView fixes
* small fix
|
2017-05-07 12:36:25 +02:00 |
|
NerdNumber9
|
9dbb59f337
|
Upstream merge
Internal permission change
Fix url adder
|
2017-05-04 23:38:17 -04:00 |
|
len
|
10a1ba95d6
|
Support API 25 again. Bump dependencies
|
2016-11-05 19:28:47 +01:00 |
|
len
|
e375101132
|
Revert "Support API 25. Use new DividerItemDecoration."
This reverts commit 05b14bae7b.
|
2016-10-22 21:42:48 +02:00 |
|
len
|
05b14bae7b
|
Support API 25. Use new DividerItemDecoration.
|
2016-10-22 20:21:25 +02:00 |
|
len
|
11ac4df5d7
|
Bump dependencies, remove unused resources
|
2016-09-29 19:53:59 +02:00 |
|
inorichi
|
05c0516a57
|
New reader menu (#368)
|
2016-06-27 16:46:31 +02:00 |
|
len
|
9beeca652f
|
Rewrite preferences with a modified support library v7
|
2016-06-16 20:52:51 +02:00 |
|
Bram van de Kerkhof
|
86db7497e9
|
Small card fixes (#338)
|
2016-06-07 20:36:40 +02:00 |
|
Bram van de Kerkhof
|
172305fc6a
|
Wrong card background fix + bump gradle version (#337)
|
2016-06-07 20:14:36 +02:00 |
|
Bram van de Kerkhof
|
26f4f53ec2
|
Fixed spinner + improved ripple (#310)
|
2016-05-25 00:09:24 +02:00 |
|
NoodleMage
|
575eaee1d2
|
UI tweaks
|
2016-05-19 16:29:25 +02:00 |
|
len
|
81d39ea272
|
Remove unused attrs and colors. Theme preference dialogs on API >= 21
|
2016-04-10 17:34:10 +02:00 |
|
len
|
936ede9aba
|
Light and dark theme are now using different accent colors
|
2016-04-10 15:48:57 +02:00 |
|
NoodleMage
|
5ef5f9b45f
|
Rewrote Theme
|
2016-03-17 20:01:52 +01:00 |
|