copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions
4495 commits 2 branches 67 tags 103 MiB
Commit graph

2909 commits

Author SHA1 Message Date
arkon
95c828bed6 Reduce height of sheet when on color filter tab 
(cherry picked from commit e7a81072796a2a699182af6444e8c86273dcb514)
 2021-03-28 17:53:35 -04:00
arkon
8721d8c9ec Add tooltips to bottom reader menu items 
(cherry picked from commit bff73b1b404e6c39727a8bd92d24c0de72efc406)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
 2021-03-28 17:53:25 -04:00
arkon
75f0ab2f40 Split general and reading mode sheet settings 
(cherry picked from commit 64c47bbaedeeca6d2bff81cf37baee01e2067306)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_pager_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
 2021-03-28 17:47:31 -04:00
arkon
709f76d53d Merge reader settings and color filter sheets 
Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)

(cherry picked from commit e0b7698d40678ccebfe6b546af9101c11c3a06c5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_settings_sheet.xml
 2021-03-28 17:19:57 -04:00
arkon
ac654340d8 Maybe make opening file picker for choosing backup file more reliable 
(cherry picked from commit a01792ac9a71689ef5d13a7ab4e71d7a97966062)
 2021-03-28 16:51:40 -04:00
arkon
438f64a358 Use more common MIME type for protobuf 
(cherry picked from commit 3ba078f64cad71fa2956627bbbac1c717ba350fe)
 2021-03-28 16:51:29 -04:00
arkon
41aec8bc96 Show unread entries first when sorting by unread (closes #4711) 
Based on b212f8233e

(cherry picked from commit a16240f123d3040bcfc12ba68cab77616a827898)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
 2021-03-28 16:51:17 -04:00
Jays2Kings
a1cb3afe77 Added Start/Finished Date Support to AniList 
Based on 1e3de8a67f

Co-Authored-By: Jays2Kings
(cherry picked from commit 2ba60e9114dd28341d6f88f26cd3ec297f26f4ec)
 2021-03-28 16:50:33 -04:00
CrepeTF
1165c57ffa Apply vertical seekbar hide logic to ReaderSettingsSheet 
(cherry picked from commit 4e8006f329cc87438de9202cf0ac1d0d8ceb203f)
 2021-03-22 21:10:23 -04:00
CrepeTF
565f005692 Vertical seekbar options hidden when force horizontal is enabled 
(cherry picked from commit 4105d8de5618b4becd724a00070a2c5c43ba9c3c)
 2021-03-22 21:07:34 -04:00
Ken Swenson
3a148c73ac Fix migration due to variable shadowing (#4689) 
(cherry picked from commit 472ce5a5e4fb7bdc3f52e4db2d68a5749d59fee1)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
 2021-03-22 20:31:10 -04:00
Jobobby04
12962b3486 Minor cleanup 2021-03-22 20:25:46 -04:00
Jobobby04
f02e3ae28f More blocking fixes 2021-03-22 20:11:15 -04:00
arkon
c6369ed73f Handle null Anilist start dates (fixes #4685) 
(cherry picked from commit 99ba84c8100eebba8b20729c396dfe206674f375)
 2021-03-21 00:07:02 -04:00
arkon
fae2bd7ab7 Minor code cleanup 
(cherry picked from commit 78285bdf3734bab9712756e0853778f831444b39)
 2021-03-21 00:06:54 -04:00
Andreas
03912407d5 Add navigation layout overlay (#4683) 
* Add navigation layout overlay

* Minor clean up

Destroy animator when done not on start
Move and change pref title
Add summary

(cherry picked from commit 5a7f2684b354943758475b9fe329f233b4295a84)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/values/colors.xml
 2021-03-21 00:06:46 -04:00
arkon
879b41e97d Fix chapters list getting updated from wrong thread (fixes #4505) 
(cherry picked from commit d912a42249901e5c0e3d2e4c09d8d9b89ef6bb3d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
 2021-03-21 00:04:17 -04:00
arkon
6c3a957733 Fix Bangumi search null image errors 
(cherry picked from commit 6d8c4fb8b1124b2e87595f42c4ea292559818419)
 2021-03-21 00:02:37 -04:00
arkon
3d7c00c057 Make tapping available extension row prompt install 
(cherry picked from commit a63cecbfcbd516bfcf4d12df9c185837ba1a17e2)
 2021-03-21 00:02:25 -04:00
arkon
6e1adf6e04 Fix offline restore ignoring manga from not installed sources (fixes #4679) 
(cherry picked from commit 4a5bceb4e49962f0498e69f5200800063d575444)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
 2021-03-21 00:02:16 -04:00
Ken Swenson
78d49b0742 Implement migration for source search (#4657) 
(cherry picked from commit b6e6f490e9426450260dec7465a73d37cf088128)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
 2021-03-20 15:40:14 -04:00
scb261
30250e350f Limit query for recent chapters to 500 (#4678) 
(cherry picked from commit 2145e878a45beebf5aab244f60c0ef52c867cfef)
 2021-03-20 14:57:30 -04:00
CrepeTF
d9b3b7b266 Add option to force disable vertical seekbar 
(cherry picked from commit b5df33bf14d4eea8421d2e1e6b488b79e6daa9f5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/exh/log/Logging.kt
 2021-03-20 14:56:51 -04:00
Jobobby04
a1a9b4b812 Lint 2021-03-18 21:55:25 -04:00
Jobobby04
aac2fcb7d4 Catch more mangadex exceptions 2021-03-18 19:48:06 -04:00
Jobobby04
7624abbebd Close mangadex login response body 2021-03-18 17:11:28 -04:00
Jobobby04
aa73670d50 Fix MDList not getting max chapter/marked as completed 2021-03-18 17:05:18 -04:00
arkon
7b01f0c608 Add icons for reading mode toggle 
(cherry picked from commit 609d8c9685a54734138b39cc25c261794a21ec99)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-03-18 15:40:12 -04:00
arkon
781f4e393e Less janky enum iteration 
(cherry picked from commit 2f08515455c0c9634b98e3fc24d91f4bf2a4ba90)
 2021-03-18 15:36:26 -04:00
scb261
93c92b674d Use fetch date instead of upload date when querying recent chapters (#4645) 
(cherry picked from commit 7f450e185dd6594bc56446f0c417dc4c2d327c48)
 2021-03-18 15:36:17 -04:00
arkon
368f565942 Remove __cfduid cookie check 
As per email:

Cloudflare is deprecating the __cfduid cookie and the cf-request-id headers. The __cfduid cookie will be removed on 10 May 2021 and the cf-request-id headers will be removed on 1 July. We expect that most customers will not have to take action as a result of this removal. [...] Starting on 10 May 2021, we will stop adding a “Set-Cookie” header on all HTTP responses. The last __cfduid cookies will expire 30 days after that.

(cherry picked from commit 747879b4ec6ecdb2777cf6b9d877b51e09922a8c)
 2021-03-18 15:36:08 -04:00
Riztard Lanthorn
01c298bbc1 Library update freq: add 4 & 8 hours (#4557) 
(cherry picked from commit 4193870fa6431d7df361fd912de8c7d35d97ba00)
 2021-03-18 15:36:01 -04:00
arkon
1399042efb Flip order of previous chapter reader transition text (closes #4608) 
(cherry picked from commit cdc5de3f1be7f75c1b85d019f45156a979774edc)
 2021-03-18 15:35:50 -04:00
arkon
9aca115977 Refactor LibraryUpdateService a bit for future changes 
(cherry picked from commit b5c293427017abfb1c631fe3d931376beb56b765)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-03-18 15:35:21 -04:00
arkon
e31e71ad44 Remove online protobuf backup restore option 
(cherry picked from commit 94f5117941c368ee5cb300af0d89b39b5427b8ad)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
 2021-03-18 15:20:30 -04:00
arkon
7164f686d4 Add reading mode toggle 
(cherry picked from commit 1e58b05ead62e68373775afb309fcad8b28df957)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-03-18 15:10:53 -04:00
arkon
3122f783a9 Move reader setting related classes 
(cherry picked from commit 938919bd9be821e1e24bdd583aaeb1ab430868a0)
 2021-03-18 14:55:52 -04:00
arkon
6be8e2de3c Move clear history from advanced settings to history screen menu (closes #4613) 
(cherry picked from commit b6b78994d8203a94f27d8a834bcb31d2f898d44a)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2021-03-18 14:55:42 -04:00
arkon
c092127404 Add "my" locale 
(cherry picked from commit fddd8ce30577e7b99fbbe7cb2f28192a6decf048)
 2021-03-18 14:54:03 -04:00
arkon
142fc0e4a6 Disable sensor when using force orientation (closes #4618) 
(cherry picked from commit fde6b7af4f9c7184ae1c55e1b7953619bd8e26b9)
 2021-03-18 14:53:41 -04:00
Soitora
07f684ac9e Update URL for Local Manga guide (#4641) 
(cherry picked from commit d1c2eaf6d53b80c2717b7520b9d61be0daadf094)
 2021-03-18 14:52:54 -04:00
Jobobby04
c7b6216d24 Fix recursive call 2021-03-13 11:59:14 -05:00
Jobobby04
a989426d95 Sync Follows sync status choice 2021-03-12 18:22:21 -05:00
Jobobby04
d255ee805b Mdlist only set the status to reading if Unfollowed 2021-03-12 10:02:47 -05:00
Jobobby04
21240cad06 Cleanup 2021-03-11 22:39:46 -05:00
Jobobby04
5b8b10a96b Fix full backup restore locking up 2021-03-11 22:39:18 -05:00
Jobobby04
c600d45e84 Maybe fix EHentai dupes in browse issue 2021-03-11 22:39:17 -05:00
Jobobby04
e9fd6ab470 Revert "Experimental Backup Restore fix" 
This reverts commit 3d507600cb.
 2021-03-11 19:44:36 -05:00
Jobobby04
3d507600cb Experimental Backup Restore fix 2021-03-11 19:10:34 -05:00
Jobobby04
84abe044a3 Remove Hentai Cafe Delegation 2021-03-11 19:10:33 -05:00
Jobobby04
04200bb590 Cleanup 2021-03-11 19:10:33 -05:00
Jobobby04
42d49b7cba Log tracking errors 2021-03-11 19:10:32 -05:00
Jobobby04
5dace4fd74 Fix Mangadex Login, Fix Mangadex tracking, Set Mangadex track status to Reading on tracked 2021-03-11 19:10:32 -05:00
OncePunchedMan
f7d52e0372
Added "Hot Pink" theme (#238) 
* first test

* added hot pink theme

* moved string to correct place
 2021-03-10 19:28:07 -05:00
Jobobby04
f3573d16b4 Fix #154.6, downloading a merge in the library will properly download 2021-03-07 23:17:43 -05:00
arkon
346bd5f57a Hide subtitle in migration list of sources if no language set (i.e. uninstalled source) 
(cherry picked from commit ae42f59102362449c00232b54fc8c6874392010b)
 2021-03-07 13:39:41 -05:00
Andreas
1fdb03f7db Dual page split allow to have different setting for Paged and Webtoon (#4527) 
(cherry picked from commit 7a64bf55cb8255000da7aaa0030f845b94d985b0)

# 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/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2021-03-07 13:38:17 -05:00
Jobobby04
d64a8907eb Many small changes 
- Remove unused gridlayout dependency
- Add RECIEVE_BOOT permission for EH updater
- Some suspending db IO calls
 2021-03-07 02:47:48 -05:00
Jobobby04
7e91ae02f1 Upgrade logging, now maps timber to XLog, new logging functions 2021-03-07 00:23:23 -05:00
Jobobby04
9457b832fc Surface errors when saving/sharing covers 2021-03-04 19:10:08 -05:00
Jobobby04
d0561705fe Clear db now has a option to keep read manga 2021-03-04 19:10:07 -05:00
Jobobby04
fa2cde79ba Add errors to browse + latest 2021-03-04 19:10:06 -05:00
Jobobby04
1827fe0ce1 Fix merged manga library download button trying to download from localsource 2021-03-04 19:10:06 -05:00
Jobobby04
3447e0c237 Custom status fix for clean titles 2021-03-04 19:10:05 -05:00
Jobobby04
4f9ae9cc75 Fix clear db not effecting merged manga 2021-03-04 19:10:05 -05:00
Jobobby04
cd1c6cbc89 Add manga with pages read to backup 2021-03-04 19:10:04 -05:00
CrepeTF
2e1cf49d99
Reader PR (with vertical sidebar) (#216) 
* Reader PR

* Dealt with conflicts + updates

* Adeed missing import
 2021-03-04 19:08:40 -05:00
curche
0c150694e7
Change Reader settings layout (#231) 
* Change Reader settings layout

This commit changes the way the Reader settings are displayed. The
fork specific settings for the reader have been moved to the bottom
instead of being sandwiched between settings from the main app.
Makes it look a better organised now

* restore Cts Vertical to before in Reader settings

the current layout of the Reader settings is thus
  - Reader/Defaults/Meta
  - Display
  - Reading
  - Paged
  - Webtoon
  - Continuous vertical
  - Navigation
  - Fork Settings

Changes made based on review at PR https://github.com/jobobby04/TachiyomiSY/pull/231
 2021-02-28 13:33:29 -05:00
scb261
a4c10394b6
Split transition animation setting for webtoon and pager (#230) 
* Split transition animation setting for webtoon and pager

* Move variables

* Rename config variables back
 2021-02-26 14:51:51 -05:00
curche
f78836dac4
Change Similar manga settings layout (#228) 
* convert Credit string to strings_sy element

* remove redundant similar screen title in Similar Manga settings
 2021-02-25 14:52:44 -05:00
Andreas
cfd2d43f1c Let users invert dual page split (#4470) 
* Let users invert dual page split

* Use Activity lifecycleScope and cleanup invert logic

(cherry picked from commit 776610d0e64d0c4ad02c094336efa18a144632d2)
 2021-02-24 17:15:44 -05:00
Andreas
1d3542b648 Add Right and Left to reader settings (#4489) 
* Add Right and Left to settings

* Fix whoopsie and minor tweak to how the array is fetched

(cherry picked from commit 3a790f3d66e72b77a8cd37d10fbbe53135ee9822)
 2021-02-24 17:15:33 -05:00
arkon
6dc7b9de92 Add Twitter link to About section 
(cherry picked from commit 7382042288d68efc261984bc7e3939f8b931fb53)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2021-02-24 17:15:23 -05:00
arkon
48a63e26f3 Add orientation toggle to bottom reader menu (not really) 
(cherry picked from commit 33992d80bfc67bb664c0edf48c48c7882c1ff641)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-02-24 17:12:14 -05:00
arkon
9be7c5e6e1 Initial adoption of bottom reader menus from TachiyomiSY 
Co-authored-by: Jobobby04 <jobobby04@users.noreply.github.com>
Co-authored-by: CrepeTF <CrepeTF@users.noreply.github.com>
(cherry picked from commit 89837e4cedca4fa0c7518c32cd13142ec85b5f97)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/menu/reader.xml
 2021-02-24 17:02:03 -05:00
arkon
2845d8cc98 Allow clicking the toolbar to go to the manga 
Co-authored-by: Jobobby04 <jobobby04@users.noreply.github.com>
(cherry picked from commit 8bb69c455b3af3c90340c8969f2c0f474daedbcb)
 2021-02-24 16:44:20 -05:00
Jobobby04
0185d5f7d6 Fixes for browse + latest page 2021-02-24 16:18:13 -05:00
Jobobby04
079ca1d0b3 Small cleanup 2021-02-24 16:16:47 -05:00
Jobobby04
5a67d8169d Edit manga status + edit local manga fixes 2021-02-24 16:15:19 -05:00
Jobobby04
f1cb4c38a2 Fix Hentai Cafe and 8Muses with the new split extension 2021-02-15 19:35:50 -05:00
Jobobby04
50a5ec45b3 Do a bit of optimization and cleanup, remove old EH startup code 2021-02-14 21:24:26 -05:00
Jobobby04
845dbbfa1e Revert "Hide dedupe by priority" 
This reverts commit 1a12caa487.
 2021-02-12 19:49:51 -05:00
Jobobby04
1a12caa487 Hide dedupe by priority 
(cherry picked from commit 2cf0475066)
 2021-02-12 19:25:38 -05:00
arkon
72b7dc805c Avoid crash when source list is animating 
(cherry picked from commit 2dae706198a4f9a37b25fb2c156bef1a3af67762)
 2021-02-12 18:54:29 -05:00
arkon
8029ff8ecc Avoid rare crashes in settings search for ListPreferences 
(cherry picked from commit 3eda2a220a8a4706f6d85a713eab089d20ef09f1)
 2021-02-12 18:54:21 -05:00
arkon
cd8543d40b Avoid crash when device fails to handle opening a URL 
(cherry picked from commit 61e5440b7c9c01dcb4a373d407da4872a4f38de2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
 2021-02-12 18:54:09 -05:00
arkon
7d1fd9f0bb Avoid crash if activity is already dead 
(cherry picked from commit 2e2663bad9a627c1eb3093cb0f1f1e9fdf31cf3f)
 2021-02-12 18:41:31 -05:00
arkon
0f349da3bc Require minimum WebView v88, try to catch fatal errors too 
(cherry picked from commit f5f592be912b4c286d6d9cdcf801354205f439a7)
 2021-02-12 18:40:12 -05:00
arkon
33d0507f98 Minor download icon optimizations 
(cherry picked from commit 7a373fb43a2d3f736c032d88b31a4a3bffd8dc5b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2021-02-12 18:40:02 -05:00
arkon
16f9ca381e Make backup restoring logic more sequential 
(cherry picked from commit aded11e5996161036e3df01bacecdacb30f3e34b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
 2021-02-12 18:37:19 -05:00
arkon
2ff186eaec Remove ExperimentalSerializationApi opt-in annotations 
(cherry picked from commit 41d7cee020682bf75fb1620b9792ff6793c50f9c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
 2021-02-12 16:31:23 -05:00
arkon
c29690282c Handle link for multisource extension commits (closes #4432) 
(cherry picked from commit a398c3fb81090d27de578d960198ba7d7ba2e68f)
 2021-02-11 19:27:23 -05:00
arkon
f93d21774f Adjust some scopes 
(cherry picked from commit 2a454b44ccd32c3108044e94c6b26fc76b0b9427)
 2021-02-11 19:27:15 -05:00
Jobobby04
efe0d9de05 Cleanup 2021-02-11 19:27:10 -05:00
vance
37ce2140f3 Added dual page split setting (#4252) 
* Add DualPageSplit option

* remove extra line

* Split double-page into two pages

* Remove !isAnimated check and add (ALPHA) to the label

* Fix missing insert pages

* Pager cleanup

* Add dual split to Webtoon and fix Vertical

* Fix L2R/R2L

* Add comments and refactor code in ImageUtil

* Use a simpler split solution in webtoon mode

Co-authored-by: weng <>
Co-authored-by: Andreas E <andreas.everos@gmail.com>
(cherry picked from commit b5017eebbf0740189f254d5db25df3c54a282e1f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt
 2021-02-11 19:25:58 -05:00
arkon
c5ef58ac72 Add weekly to library update frequency options (closes #4422) 
(cherry picked from commit aa67229dafb87e298ea5b4826bee5424754d1ee1)
 2021-02-11 19:17:57 -05:00
arkon
cb1ea6f571 Clean up LibraryUpdateService a bit 
(cherry picked from commit 5af68186d6de62a5746d758977a9ca834c25f547)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-02-11 19:17:44 -05:00
arkon
e9ec281159 Open manga when clicking thumbnail in migration list (closes #4152) 
(cherry picked from commit 545bc0e605d380fd47f5c4d930a6613b7ec78266)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt
 2021-02-11 19:12:23 -05:00
arkon
ede6a54b30 Remove unnecessary LayoutContainer implementations 
(cherry picked from commit 291168f4debfc87a62c77c252c77ebeff4b3aafd)
 2021-02-11 18:13:41 -05:00
arkon
79770a9deb Add action to directly share crash log file from notification 
(cherry picked from commit 9facb51f2213fc8dcc69739a4f731b15f5c7f1f6)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt
 2021-02-11 18:13:32 -05:00