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

1666 Commits

Author SHA1 Message Date
Jobobby04
b8e907cea2 Block merged manga from being able to be migrated 2021-04-15 15:28:28 -04:00
Jobobby04
13f4bfa7bc Remove source migration action 2021-04-15 14:57:49 -04:00
arkon
01ad3dc92b Handle reader toolbar subtitle getting cut off when text is too big (closes #4843) 
(cherry picked from commit 544adb9940bce8f42f9241c53785cb85192d533f)

# Conflicts:
#	app/src/main/res/layout/reader_activity.xml
 2021-04-14 18:38:09 -04:00
arkon
d3d937fe17 Use accent color for edge effect 
(cherry picked from commit a4e5e3ece5a5d7c8a5b6b67a130b8458d4956d71)
 2021-04-14 18:17:48 -04:00
arkon
fbe10151f4 Add navigation bar scrim (closes #4836) 
(cherry picked from commit 2a69d1b0510107efd38de10853efabb90757635d)
 2021-04-13 18:51:57 -04:00
arkon
b0a2d8908f Disallow forced dark mode, such as MIUI's 
(cherry picked from commit f4f1efe5faca0184607332fc3ebab1eaa4ab7b30)
 2021-04-13 18:49:45 -04:00
arkon
b322ecd34a Fully expand source filter sheet on show (closes #4455) 
(cherry picked from commit 99b46096a46ce4a56f4461d7ad7c7a24b0cf510b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
 2021-04-13 18:49:23 -04:00
arkon
540e234562 Use same non-sticky heading style as Browse for Updates/History (closes #4822) 
(cherry picked from commit 12e90ae35e37dd9d155a65d03a071f9d56e8f716)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt
 2021-04-13 18:31:18 -04:00
Eugene
d23b3c82ba
Rus locale (#262) 
* Rus lacale

* pref_left_handed_vertical_seekbar_summary

* Fix 1
 2021-04-11 23:47:47 -04:00
Jobobby04
6fa67c9a5f Release 1.6.0 2021-04-11 21:51:55 -04:00
Jobobby04
5df0eb7ed1 Convert EHentai Login controller to a activity 2021-04-11 20:43:21 -04:00
arkon
1c56624d13 Make library update/backup error log action clearer for non-technical users 
(cherry picked from commit a82e5f545221a8347c1c25bd58aeaebd4a5453b6)
 2021-04-11 18:47:32 -04:00
arkon
af77a58dcb Update DoH translations 
(cherry picked from commit c7e07a6df059b122c06aa12f74c414fde1653467)
 2021-04-11 18:47:16 -04:00
Jozef Hollý
5ee87ce8fc Weblate translations (#4647) 
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Arlangue <virgilemp@outlook.fr>
Co-authored-by: August Wale <bleachlithium@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Edgar Mejía <edgar13155@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Flamm <robindevaux25@gmail.com>
Co-authored-by: Hajba Károly <karoly.hajba98@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jakub Fabijan <animatorzPolski@gmail.com>
Co-authored-by: Kiroki Benjamin <heptahex999@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: LOKE__01 <luckylakshman378@gmail.com>
Co-authored-by: Luis Andrés Bajaña F <labfernandez2014@gmail.com>
Co-authored-by: Lusuho <jevpsychox@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Matyáš Caras <hernik27@gmail.com>
Co-authored-by: Michalis <michalisntovas@yahoo.gr>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nikola Perović <nikolaperovicccc@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: P6N7L <nichitapospai@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pijus Bend <pijus.bend@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Q farfayoux <aym.belrhiti@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Schrödinger's cat <schrodingers-kate@protonmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tantia <ilovechocobi@yahoo.com>
Co-authored-by: TheLastMelody <swordofthefallen@hotmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Yardi van Nimwegen <yardivn@live.nl>
Co-authored-by: antocs <roxasthethund@yahoo.it>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: 殺Mustafa <mustafasheref8@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/eo/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kn/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/my/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Arlangue <virgilemp@outlook.fr>
Co-authored-by: August Wale <bleachlithium@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Edgar Mejía <edgar13155@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Flamm <robindevaux25@gmail.com>
Co-authored-by: Hajba Károly <karoly.hajba98@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jakub Fabijan <animatorzPolski@gmail.com>
Co-authored-by: Kiroki Benjamin <heptahex999@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: LOKE__01 <luckylakshman378@gmail.com>
Co-authored-by: Luis Andrés Bajaña F <labfernandez2014@gmail.com>
Co-authored-by: Lusuho <jevpsychox@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Matyáš Caras <hernik27@gmail.com>
Co-authored-by: Michalis <michalisntovas@yahoo.gr>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nikola Perović <nikolaperovicccc@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: P6N7L <nichitapospai@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pijus Bend <pijus.bend@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Q farfayoux <aym.belrhiti@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Schrödinger's cat <schrodingers-kate@protonmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tantia <ilovechocobi@yahoo.com>
Co-authored-by: TheLastMelody <swordofthefallen@hotmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Yardi van Nimwegen <yardivn@live.nl>
Co-authored-by: antocs <roxasthethund@yahoo.it>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: 殺Mustafa <mustafasheref8@gmail.com>
(cherry picked from commit 2e0c778090c11eb0005e8fa0b2bc66bf466297a5)
 2021-04-11 18:47:09 -04:00
arkon
828944950b Add Google DoH provider 
(cherry picked from commit b2d4e5ab846bcb5807785a0d1bfb82e9c5caeec6)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2021-04-11 18:46:37 -04:00
Ivan Iskandar
9e40625c08 Draw edge-to-edge (#4802) 
(cherry picked from commit f3660d88ddf21d92a80cc5e73bfa012ddf506e75)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2021-04-11 18:43:19 -04:00
arkon
5e8b5ef6cf Add clarification for category exclusion (closes #4777) 
(cherry picked from commit b2d697131cabc8b85a06f871b4d0ce23f08532a1)
 2021-04-11 18:40:31 -04:00
arkon
1ba07466ef Minor cleanup 
(cherry picked from commit ef49fc91d8c40a45efab6661f9dfe78e147bc732)
 2021-04-11 18:40:23 -04:00
arkon
bcc120056c Make reader spinner colors a bit more consistent 
(cherry picked from commit 7504621a24597340f47edb140fee939ac79fb5ec)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
 2021-04-11 18:38:58 -04:00
arkon
0e8aec7929 Align filter spinners (closes #2995) 
(cherry picked from commit 88e49a9b8bebdc226fb9e37a21bc0b42115e802e)
 2021-04-11 18:37:13 -04:00
Riztard Lanthorn
03366ae7e5 add sort by date fetched in library (#4773) 
* add sort by date fetched in library

* chapter fetch date to 8

(cherry picked from commit ddd4cc10ff12d2497a001821c678f2c1a90eef34)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt
 2021-04-04 19:12:25 -04:00
arkon
b5a109440f Allow excluding categories from library update 
Closes #3467, #4661, #1839

Supersedes #4474

(cherry picked from commit 4f1275ac019c60f60eb503ba17ec3014d36a974b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
 2021-04-04 19:10:42 -04:00
arkon
30ed1f11ee Fix label overflow for reader spinner preferences 
(cherry picked from commit 3257cbe21f45ace1554f82bf9e75d014c8e3b534)
 2021-04-04 19:09:07 -04:00
arkon
c2e882cb5b Allow weaker unlock methods (closes #4265) 
(cherry picked from commit 68600b337e7d96350c994c87fb052c1a70640990)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/security/SecureActivityDelegate.kt
 2021-04-04 19:08:22 -04:00
arkon
3aa5a36fdd Minor cleanup 
(cherry picked from commit a3992d9fbeb2b215ecb94dacc9b182a80bffb4c9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
 2021-04-04 19:05:54 -04:00
Andreas
38a46825e2 Remove weird cropping from icon when showing missing chapter warning (#4769) 
(cherry picked from commit fba428257b1046b9b7c84fa50e6b31acbf4cb68d)
 2021-04-04 18:56:56 -04:00
arkon
620887f90b Add QuadStateCheckBox view 
(cherry picked from commit 940d8389b5a9e177e2995817ba688dd689025d2b)
 2021-04-04 18:56:39 -04:00
Jobobby04
d294db3e4e Continues -> Continuous 2021-03-30 20:00:55 -04:00
arkon
fb01b547de Add icon for crop border shortcut off state 
(cherry picked from commit 4054f2a6a0b627ec87a18519da3e169f41413ca4)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/res/layout/reader_activity.xml
 2021-03-30 19:24:46 -04:00
arkon
d3482ef734 Allow translating DNS over HTTPS (closes #4747) 
(cherry picked from commit 468cdf603cd129219166f1773b831a0c4106770b)
 2021-03-30 19:24:45 -04:00
Johannes Joens
90ffb8cdf6
add support for Repos with Numbers in their name (#255) 
* add support for Repos with Numbers in their name

* Update strings_sy.xml

changed invalid_repo_name to better reflect its meaning
 2021-03-30 19:23:52 -04:00
Jays2Kings
dc760c0596 Backing up custom data for manga 
Using 800s from J2k in BackupManga for this(except for status)

(cherry picked from commit c21b91bc026213993a67089ef4bc76c68ade4445)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
#	app/src/main/res/values/strings.xml
 2021-03-28 19:46:11 -04:00
arkon
de9ce8f949 Use regular crop icon 
(cherry picked from commit 71aa5921112717c4347a0a4ea1263c7e81dd5cf0)
 2021-03-28 19:10:27 -04:00
arkon
3c3f5cf35d Add crop borders shortcut 
(cherry picked from commit d501c02f8bdc666e5701518da2e0845d7b494e9e)

# Conflicts:
#	app/src/main/res/layout/reader_activity.xml
 2021-03-28 19:10:15 -04:00
arkon
7407e22b4e Remove ALPHA from dual page split label 
(cherry picked from commit 9daf0e78b889cc6ed139b159f8b4261273c7ddcc)
 2021-03-28 19:05:12 -04:00
arkon
404a6a621a Prevent manga title from jumping (fixes #4709) 
(cherry picked from commit c58e4f4deef79e0a03fd149adbf54b77a6e04369)
 2021-03-28 19:04:38 -04:00
arkon
8b37c27a73 Cleanup reader spinner layouts 
(cherry picked from commit c4b975b77734c8cea843796bae87ee6e236180f4)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
#	app/src/main/res/layout/reader_webtoon_settings.xml
 2021-03-28 19:01:08 -04:00
arkon
2988524fd8 Clean up reader sheet spinner preferences 
Based on fe2543b9d5

Co-Authored-By: Jays2Kings
(cherry picked from commit 14c114756dbcc9d952790918c0a47b2bdc2dbade)

# Conflicts:
#	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 18:01:39 -04:00
arkon
5b9d2175e2 Reorganize reader sheet contents a bit 
(cherry picked from commit c255f57d956a6f81d4a1ea6c22e1ca29d81d28ba)

# Conflicts:
#	app/src/main/res/layout/reader_general_settings.xml
 2021-03-28 17:49:40 -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
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
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
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
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
b2bfccdeae Round snackbar corners 
(cherry picked from commit bc34d4fa88285f0622963cf8c1e47a9853dec58e)
 2021-03-18 15:35:41 -04:00
arkon
0d46e00b31 Adjust reader navigation button ripples 
(cherry picked from commit 6fd4af8736b0ddfdf37d31cd7d84bb435fd12395)
 2021-03-18 15:35:33 -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
df950219f5 Use Material dialogs for preferences 
Partially addresses #2907

(cherry picked from commit 112e233498f45462679ba98daee9d69ce8f790f4)
 2021-03-18 15:11:13 -04:00