Commit graph

470 commits

Author SHA1 Message Date
arkon
f180c6a07c Reword NSFW settings section
(cherry picked from commit f6af1184bcf5535d3abf649a6e10fb37efd19603)
2020-12-21 14:21:35 -05:00
arkon
17731f3904 Remove bundled fallback file picker
(cherry picked from commit e8627800fef6525bc4ed3324c03178d7ac8850cd)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
#	app/src/main/res/layout/common_listitem_dir.xml
#	app/src/main/res/values/styles.xml
2020-12-21 14:21:34 -05:00
arkon
8b6a0ad891 Note that toggling NSFW sources requires a restart
(cherry picked from commit bbc00768f084034514998960f9450048595e1d95)
2020-12-21 14:21:32 -05:00
arkon
cf99ee73f5 Break out NSFW hiding/labeling into separate settings
(cherry picked from commit 5b09461ccf76963fef844d7550383205e8d33010)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
2020-12-21 14:21:31 -05:00
Jobobby04
5e6c0bbc14 Change Search in Tachiyomi to Search in TachiyomiSY 2020-12-21 14:21:30 -05:00
arkon
7d11cc4837 Add text selection shortcut to invoke global search (closes #4058)
(cherry picked from commit b6e246c6b22845d685de8fd786ba32e8306e2328)
2020-12-12 12:19:53 -05:00
Jobobby04
4a1e832bf5 Revert "Cool gray theme (#169)"
This reverts commit ac31f12138.
2020-11-29 17:19:29 -05:00
arkon
02946af081 Move NSFW source setting into Browse settings
(cherry picked from commit c8316c72544308755fa73de9b5c632fd09fc7df3)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
2020-11-29 00:23:06 -05:00
arkon
efa1f47392 Fix restore in Android 11
(cherry picked from commit c0e48632290af95f138dcc33e79b3136ae0f29a9)
2020-11-29 00:23:05 -05:00
CrepeTF
ac31f12138
Cool gray theme (#169)
* Added "Cool gray" (Google gray)

* Added "Cool gray" (Google gray) theme
2020-11-27 13:14:31 -05:00
arkon
bb7b79a6e9 Add help shortcut for source migration (closes #3951)
(cherry picked from commit 56c19e57a9c062341c848975a150ca21d151006e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt
2020-11-25 15:04:32 -05:00
arkon
22019a8046 Merge restore entry points, avoid unnecessary new strings
(cherry picked from commit eceac4d6e34ad3c30a4e929e4af1e2d8e86ad126)
2020-11-21 16:31:37 -05:00
Dominik Chrástecký
61b0039a78 add support for S Pen actions (#4029)
(cherry picked from commit c9b1a425a73fda175a72951a2883daebad9555ba)
2020-11-21 16:28:14 -05:00
Jobobby04
f6fd8a8ddb Make offline the default 2020-10-14 12:46:39 -04:00
jobobby04
445878794c
Make a protobuf based backup system (#112)
* Make a protobuf based backup system, restore not tested

* Fix a number

* Remove uneeded change

* Remove more uneeded changes

* Use 1.x style models, backup should be 100% compatible with the 1.x backups

* Fix restore service not running

* Fix offline chapter restore
Cleanup saved searches restore(untested)

* Implement onlione/offline option, fix merged manga restore online, fix restore total

* Allow setting auto backup to use a full backup

* Fix for saved searches restore

* Edit some comments

* Convert flows back to observables

* Fix a model

* Fixes and comment only the SY specific things

* Move SY values range to 600 from 60

* Combine legacy and full backup services into one
Deduplicate a lot of code
Simplify a lot of stuff
Modify comments

* Cleanup

* Remove unneeded protobuf config edit because its now the default

* Migrate to kotlinx.serialization for backup saved searches

* Cleanup saved searches more, move gson type adapters to the legacy package
2020-10-12 14:41:56 -04:00
Andreas E
f6d3c38d03 Ability to delete reading history (#3871)
* Added ability to delete history for all manga

* Fix review comments

(cherry picked from commit 812368e332b56a3b8964e7c1247c9fbc18804516)
2020-10-03 12:57:29 -04:00
arkon
6a3a5c58d4 Minor string cleanup for Incognito Mode
(cherry picked from commit 4b78ff324dcce13e3f159b1067aad46391cfcce3)
2020-10-03 12:57:01 -04:00
Platiplus
e1d7713f14 [Feature Request] Option to turn off History - #3772 (#3855)
* Implementing do not save chapter history preference

* Refactor of labels

* Changing incognito mode from Readers section to More

* Fixing imports and removing unused strings

(cherry picked from commit 79ccfcd55397f3df7ce91d88e93a7c879a3360ab)
2020-10-03 12:56:53 -04:00
arkon
8acd834783 Use tristate checkboxes for chapters list filters
(cherry picked from commit fb3756420bcaf2ae568fff819ee3726e327e223a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2020-09-29 12:35:40 -04:00
scb261
2130a2a67e Add option to hide bottom bar when scrolling (#3758)
* [wip] hardcoded flag for hide on scroll

* add corresponding option in settings

* clean up a little

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 3784d1a8f2886e1ebc598cd83afa2622f9c44b43)
2020-09-29 12:25:25 -04:00
scb261
a8946e4f98 Add ability to choose what to remove for selected mangas (#3796)
* [wip] started to change manga delete options

* Change dialog for deleting selected manga

* Move array to appropriate file

* Make first option enabled by default

* Use radio buttons to reduce amount of clicks

* Revert "Use radio buttons to reduce amount of clicks"

(cherry picked from commit 458e761b458bb3cb41924e88643faf2ee7efd4d9)
2020-09-29 12:25:16 -04:00
arkon
ea3f90f107 Minor settings search code cleanup
(cherry picked from commit 3bce07e8734b4104f70788232eade97986c11161)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
2020-09-24 09:13:48 -04:00
arkon
26557b3257 #3520 Searchable Settings (#3683)
* Adding class stubs for settings search, UI elements.

* -  implement searchable settings
- `SettingsController.setupPreferenceScreen` must return a PreferenceScreen

* Remove unneeded SettingsControllerFactory.

* Set query hint, clean up code smell.

* Add search button to MoreController, stop infinite recursion.

* - initialize SearchResultCollection once in Activity.onCreate

* - implement prefernce highlighting after settings search

* - Ensure all Preferences have a key set or else the highlighting effect will have no effect on it.
- remove ExtensionFilterController and SourceFilterController from settingControllersList in SettingsSearchHelper, since those are related to Extensions and not Settings

* Limiting search to settings menu only, localized breadcrumb string, and code cleanup after code review.

* - moved call to SettingsSearchHelper.initPreferenceSearchResultCollection() into SettingsSearchController

* Code review cleanup and refactoring.

* Inlined non-reused key strings.

* Adding more UI polish, add comments for future enhancements.

* - retain search query when navigating *away* from SettingsSearchController
- keep `searchItem` in `expandActionView` state until user goes back (fixes the empty view in `SettingsSearchSearchController` issue)

Co-authored-by: mpm11011 <markuscicero5@gmail.com>
Co-authored-by: lmj0011 <9396189+lmj0011@users.noreply.github.com>
(cherry picked from commit 766f9e37b52873080c58d73dfaff42c5add24dc0)

# Conflicts:
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
2020-09-24 09:09:45 -04:00
Jay
2583be9923 Send manga/chapter/page details when sharing a chapter page
(cherry picked from commit 004e1c98ee27881f1d70b0b74a912eee81b37e94)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2020-09-15 18:16:06 -04:00
arkon
8df978a91c Clean up global chapter settings code
(cherry picked from commit da5f10a2f1ac4f65c740c9838558456c43855678)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
2020-09-15 14:52:31 -04:00
lmj0011
763335bd85 [feature] add ability to set global filter/sort/display for Manga chapters (#3622)
* - [feature] add ability to set global filter/sort/display for Manga chapters

* - move default chapter settings functionality to overflow menu
- code clean up

* - show confirmation dialog when user selects "Set as Default" option in Chapter Settings

* - hide overflow menu in LibrarySettingsSheet

* - apply default chapter settings if manga is added to Library from a Source's browsing screen

Co-authored-by: arkon <arkon@users.noreply.github.com>
(cherry picked from commit 64050e8266603320ec6dafa4a70849aa4a28004b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2020-09-15 14:27:42 -04:00
arkon
4e8c30b7fe Start updating manga info view header design (SY edition)
(cherry picked from commit 791a7d5a01e25b13634291fc1af5970ea35f7692)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/res/layout/manga_info_header.xml
2020-09-15 14:08:14 -04:00
AbdullahM0hamed
c8a4ec37e0
Add Black-Red theme (#95)
* Appveyor

* stuff

* resolve conflict

* Let's try this again

* try again

* More fixing

* remove appveyor

* revert build.gradle

* Revert "revert build.gradle"

This reverts commit feaaa78157ffe8d6d6af7d6d63a74bc14b92f584.

* Undo line change

* Update build.gradle

* Update MainActivity.kt

Co-authored-by: AbdullahM0hamed<AbdullahM0hamed@users.noreply.github.com>
2020-09-10 17:06:49 -04:00
arkon
7579bb026f Localize "No chapters found" error
(cherry picked from commit 66baf01e43de23bf8cacae51896850e9854a75af)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
2020-09-05 19:19:37 -04:00
Andreas E
61fb836be4 Add missing chapter warning (#3745)
* Add missing chapter warning

* Flip calculation instead of flipping variables

* Change logic

* Change tint based on reader theme

* Add missing chapter warning to WebtoonTransitionHolder

* Add chapter warning between current/finished and prev/next

* Fix mix up of TextViews

* Fix review comments

(cherry picked from commit 7a33e198dc4a298b7dee6e866bdaaaf7b3db5efb)
2020-09-05 19:11:20 -04:00
arkon
a5a79c1127 Remove unused string, fix improperly formatted Slovak string
(cherry picked from commit 565e8cf00b43ae3d2bc3c47e34634636135d6df4)
2020-09-05 19:03:58 -04:00
arkon
3b87111f22 Minor wording edit
(cherry picked from commit ba6778143162b185cc5d5a0dc5e5c0e4968c6258)

# Conflicts:
#	app/src/main/res/values/strings.xml
2020-08-18 22:31:50 -04:00
arkon
ce36e6b242 Split out NSFW source setting to separate section
Temporarily hidden until feature is ready for stable release.

(cherry picked from commit 65b32ddeb22f109e59571c98121aa87bfe07d300)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
2020-08-12 00:34:10 -04:00
arkon
f006467138 Add 18+ warnings in extensions list
(cherry picked from commit b657bba96e333476c89b2e4da2d15f7dfaad1ab0)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
2020-08-12 00:32:57 -04:00
arkon
d7d1d97f5f Add option to prevent deleting bookmarked chapters (closes #2082)
(cherry picked from commit dbaac69fada009fdf92500303e89f864ac3fdf48)
2020-08-09 19:20:01 -04:00
arkon
d7976e6054 Minor rewording of chapter deletion settings
(cherry picked from commit cce919750a23c1b6e61d58d5bb8b636cc7590136)
2020-08-09 19:19:45 -04:00
arkon
6f71bb3abe Allow partially loading extensions with individually marked NSFW sources
(cherry picked from commit 421dfb4a2d190a21d4862ef7da21b540ac6473ab)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt
2020-08-09 19:17:55 -04:00
arkon
f8c4bbdfd8 Option to hide NSFW extensions (closes #1312) (SY will expand more on this when preview finishes it)
(cherry picked from commit abaca6e676f7f887311e678ce04e0c679264f48e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionPresenter.kt
2020-08-08 16:47:29 -04:00
arkon
165b243aab Warn before restoring backup if trackers aren't logged in
(cherry picked from commit b1fb401f6321f37313db8c7a97f5f47abbd94ba3)
2020-08-05 22:56:46 -04:00
arkon
01ea86ab90 Move download warnings/errors to separate notification channel
(cherry picked from commit 8e8c30c1eb16f4740c9d3760caced0099ea014db)
2020-08-02 15:10:52 -04:00
arkon
e338bb0f47 Split download notifications into progress and complete channels
(cherry picked from commit 3813743e3dec3e0fe08a44d0dce8eb929b851886)
2020-07-29 23:21:01 -04:00
Jimmy Low
70d134b375 [Feature Request] - Download Complete Remidner #3475 (#3527)
* [Feat] Show a download complete notification channel when all downloads are completed. Auto cancels when onclick and navigate to download screen.

* [Feat] Update the download message string to shorten the length.

(cherry picked from commit 7e73ede47abcd1f65ab2e0eb9506409d0357643b)
2020-07-29 19:27:19 -04:00
arkon
99becd4fd6 Show message when searching with no pinned sources
(cherry picked from commit e95a5be21df6520ee2b5ae873a39b6671222a03d)
2020-07-25 22:19:08 -04:00
arkon
a5c4098109 Show tracker status in button
(cherry picked from commit a443dc3040f5e736ce632a5d00cbca77832ca46d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
#	app/src/main/res/drawable/ic_done_white_18dp.xml
2020-07-19 18:52:23 -04:00
arkon
8de67c49bc Include source ID if name not found in restore error log (closes #3018)
(cherry picked from commit 6713a7ae3cd37855c011d980e3534865a115d6a6)
2020-07-19 18:25:11 -04:00
arkon
1188ee10d8 Use view binding for sheets
(cherry picked from commit dc43e418969bf5c37539b04787627b1b02f6ed2c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
2020-07-12 19:29:50 -04:00
Jobobby04
372e570fac Use Tachi previews info + chapters manga page, plus of course SY features integrated into it
Add missed invert tap settings
Add missed extension open in settings overflow menu option
Cleanup
2020-07-12 19:21:29 -04:00
arkon
e3d2e5b89d Add option to reverse tapping (#3360)
* Add option to reverse tapping

* Fix string for preference key

* Invert tapping for Webtoon and Vertical

* Use enum instead of boolean

* Add option to reader sheet

* Hide from reader sheet if tapping disabled and remove hard coded string

* Hide option if tapping disabled

(cherry picked from commit 04d83e9a6a0fe4618b4e60c15bb56b302f1241a9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
#	app/src/main/res/layout/reader_settings_sheet.xml
2020-07-12 16:31:40 -04:00
arkon
a9317dff88 Group theme settings into category
(cherry picked from commit fa5d2276c0c6777c1fc1d61d916a37c7d8c00c06)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
2020-07-12 16:23:14 -04:00
arkon
c2c2a3be01 Split general reader settings into reading mode and display
(cherry picked from commit d353a3457d194ed246d218a086695aeedb8d0e42)
2020-07-12 16:21:42 -04:00