admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,756 Commits 2 Branches 69 Tags
89b30bd8d8e6b16f9640ff1fe183dd8207777a3c
Commit Graph

6756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jobobby04 89b30bd8d8 Probably fix random source crashes 2022-09-26 14:00:15 -04:00
Jobobby04 8d91c54c18 Add a proguard rule for XMLUtil to fix build 2022-09-25 22:09:32 -04:00
Román 369823484a Fixes and Translations (#680) 
* Fixes and Translations

* Update some strings

* Update some strings v2
 2022-09-25 21:19:13 -04:00
renovate[bot] 2739a972a8 Update xml_serialization_version to v0.84.3 (#8079) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 7f9222f7b7)
 2022-09-25 21:13:16 -04:00
AntsyLich 452251914b Cleanup webview interceptors (#8067) 
* Cleanup webview interceptors

* Review changes + Improvement

* Review Changes 2

(cherry picked from commit a35f947892)
 2022-09-25 21:13:09 -04:00
arkon 1e9dca95cb Fix date added when adding from browse source 
Fixes #8059

(cherry picked from commit ec272f6c4e)
 2022-09-25 21:13:01 -04:00
arkon 74953850b8 Bump minimum WebView version and default user agent string 
(cherry picked from commit f0af3858e8)
 2022-09-25 21:12:54 -04:00
arkon bab663f856 Temporarily replace library category tabs divider with our own 
Fixes #7789

(cherry picked from commit db91d04e82)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
 2022-09-25 21:12:47 -04:00
arkon 1ff5e62f0a Ellipsize long titles 
Fixes #8075

(cherry picked from commit 9859b38f32)
 2022-09-25 21:11:40 -04:00
Ivan Iskandar d5fcd3a67e BrowseSourceScreen: Adjust browse mode chips placement (#8076) 
The chips row is now scrollable too and filter fab is removed

(cherry picked from commit 0190c36d20)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
 2022-09-25 21:11:29 -04:00
Alessandro Jean 2d2ee54c99 Add support to update strategy on global update (#7902) 
* Add support to update strategy.

* Add JavaDoc and bump the LIB_VERSION_MAX constant.

* Fix a word typo.

* Store update strategy enum as integer in the DB.

(cherry picked from commit ba533f30ce)

# Conflicts:
#	app/src/main/java/eu/kanade/data/DatabaseAdapter.kt
#	app/src/main/java/eu/kanade/data/manga/MangaMapper.kt
#	app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/sqldelight/data/mangas.sq
#	app/src/main/sqldelight/migrations/20.sqm
 2022-09-25 21:04:10 -04:00
Jobobby04 3da5a2a20d Minor cleanup 2022-09-25 20:41:31 -04:00
Andreas 1f4bfc4764 Split the rest of the preferences in PreferencesHelper (#8074) 
* Split the reset of the preferences in PreferencesHelper

* Capitalize ThemeMode

(cherry picked from commit 29fa93e829)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/delegate/SecureActivityDelegate.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-25 20:41:19 -04:00
Ivan Iskandar 0d0513cff7 GlobalSearchController: Auto focus search view when initial query is empty (#8073) 
(cherry picked from commit 0fabe4bd01)
 2022-09-25 19:19:31 -04:00
Ivan Iskandar fc8b15916a DownloadController: Fix first active download status not updating (#8069) 
(cherry picked from commit f98b4f4e39)
 2022-09-24 23:26:20 -04:00
arkon 46bdc0c0ad Enable Gradle parallel mode 
(cherry picked from commit b8c1257645)

# Conflicts:
#	gradle.properties
 2022-09-24 23:26:12 -04:00
Ivan Iskandar 1fe34a35d7 SecureActivityDelegate: Fix cold-start only lock behavior (#8066) 
(cherry picked from commit 467ceacb17)
 2022-09-24 23:25:14 -04:00
arkon c34108b19d Bump dependencies 
(cherry picked from commit 2d22baba62)
 2022-09-24 23:25:05 -04:00
arkon 3791be324d Remove Tagalog translations 
Filipino should be used instead. Hopefully Weblate stops adding this back??

(cherry picked from commit 750f90614d)
 2022-09-24 23:24:57 -04:00
Weblate (bot) 84c5e94f0d Weblate translations (#8023) 
Co-authored-by: Amjad Ali <playeroid96@gmail.com>
Co-authored-by: Andrii Yefremov <ka1tzyu@gmail.com>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: moon <moononclouds@proton.me>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ko/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/vi/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Amjad Ali <playeroid96@gmail.com>
Co-authored-by: Andrii Yefremov <ka1tzyu@gmail.com>
Co-authored-by: DatTran MLL <tranthanhdat1142003@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Uzuki Shimamura <hzy980512@126.com>
Co-authored-by: moon <moononclouds@proton.me>
(cherry picked from commit d28ded4525)
 2022-09-24 23:24:48 -04:00
stevenyomi 5da4353730 Improve chapter recognition (#8050) 
(cherry picked from commit 4b4a138eee)
 2022-09-24 23:24:39 -04:00
Andreas 02a154bb85 Move chapter preferences from PreferencesHelper to LibraryPrefrences (#8061) 
(cherry picked from commit b5dca2eb09)

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
 2022-09-24 23:24:28 -04:00
Ivan Iskandar 35b71e2ceb Adjust source-api R8 rules (#8064) 
(cherry picked from commit 747cbd24cb)
 2022-09-24 23:14:22 -04:00
Andreas 1d9237d3ee Clear search query before popping controller when navigating up (#8055) 
(cherry picked from commit d3520419d4)
 2022-09-24 23:14:06 -04:00
Andreas e5b99c0147 Recreate reader settings when opening sheet (#8054) 
(cherry picked from commit acb8ab15b2)
 2022-09-24 23:13:59 -04:00
Andreas 34735166ec Split backup preferences from PreferencesHelper (#8051) 
(cherry picked from commit 5cdcc1679f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
 2022-09-22 12:58:54 -04:00
arkon 7f29d6fc74 Minor cleanup 
Also add POST_NOTIFICATIONS permissions to make Android Studio stop complaining about it.

(cherry picked from commit b37b3767f3)
 2022-09-22 12:48:23 -04:00
arkon 27e494e8b7 Replace deprecated SmallTopAppBar 
(cherry picked from commit 2d56ad1ad9)
 2022-09-22 12:47:53 -04:00
arkon 260e3919ca Bump dependencies 
(cherry picked from commit 5d3bc7245e)
 2022-09-22 12:47:44 -04:00
Andreas 416db76218 Split download preferences from PreferencesHelper (#8048) 
(cherry picked from commit e82963c9ef)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/chapter/interactor/SetReadStatus.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
 2022-09-22 12:47:25 -04:00
happywillow0 02fe0df8f6 Update BrowseSourcePresenter.kt (#8040) 
Set filters to default when reset is pressed.

(cherry picked from commit ec34977a64)
 2022-09-22 12:36:22 -04:00
Jobobby04 8fb2faca12 Don't uselessly override the search in SearchController 2022-09-22 12:36:02 -04:00
stevenyomi 7e7692c3cf Fix error when updating manga details with uninitialized title (#8045) 
(cherry picked from commit 2ced56e490)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
 2022-09-21 11:49:04 -04:00
Andreas bdc45fb8aa Split track preferences from PreferencesHelper (#8046) 
(cherry picked from commit e568951396)
 2022-09-21 11:47:02 -04:00
Andreas bcc3a40b36 Split reader preferences from PreferencesHelper (#8042) 
(cherry picked from commit e275897bf9)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	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/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderGeneralSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ViewerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2022-09-20 16:57:00 -04:00
arkon 9a3c4e9d13 Remove redundant preference keys 
(cherry picked from commit 2b089648a3)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
#	app/src/main/java/eu/kanade/domain/source/service/SourcePreferences.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
 2022-09-20 16:28:02 -04:00
AntsyLich 7041ce777a Cleanup logic in UpdatesPresenter (#8035) 
(cherry picked from commit c2a831dded)
 2022-09-20 16:17:33 -04:00
Andreas b7363706d7 Split library preferences from PreferencesHelper (#8036) 
(cherry picked from commit c740558327)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/category/interactor/SetDisplayModeForCategory.kt
#	app/src/main/java/eu/kanade/domain/category/interactor/SetSortModeForCategory.kt
#	app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
 2022-09-20 16:17:17 -04:00
arkon d73e7aee9d Clean up UpdatesController 
- Move loading state into scaffold (closes #7704)
- Move logic into presenter
- Make some composables private

(cherry picked from commit 0e3176a77c)
 2022-09-20 15:55:28 -04:00
arkon 840e021949 Replace clear database FAB with button 
Also remove a bunch of unnecessary inset paddings since Scaffold handles it

(cherry picked from commit f85cbb1582)
 2022-09-20 15:53:31 -04:00
Jobobby04 b479d5a4f1 Fix crash 2022-09-20 15:50:14 -04:00
arkon 00bb74f330 Clean up base classes 
Should be able to throw away some of the search controller stuff after Global Search is migrated

(cherry picked from commit 0225711f6f)
 2022-09-20 11:08:23 -04:00
arkon 966bd31d61 Catch error properly when app update check fails (fixes #8019) 
(cherry picked from commit 7ec822503a)
 2022-09-20 11:08:14 -04:00
arkon 6c3183af8d Minor cleanup/fixes 
- Add FAB collapsing in clear database screen (fixes #7935)
- Don't allow multiline category names to be entered
- Consolidate Downloaded Only / Incognito Mode banner components
- Fix see-through migrate screen sticky header

(cherry picked from commit 83871fc013)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
#	app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
 2022-09-20 11:08:05 -04:00
Andreas f40477cf6e Split security preferences from PrefrencesHelper (#8030) 
(cherry picked from commit b668364afb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
 2022-09-18 13:25:51 -04:00
arkon bffecf3833 Avoid invalid locales in language picker (fixes #7950) 
We should probably prune the translations though.

(cherry picked from commit 877ae041a4)
 2022-09-18 13:08:54 -04:00
arkon 42a4d154cc Read metadata from ComicInfo.xml files in Local source (#8025) 
Co-authored-by: Shamicen <84282253+Shamicen@users.noreply.github.com>
Co-authored-by: Andreas <andreas.everos@gmail.com>
Co-authored-by: jobobby04 <jobobby04@users.noreply.github.com>
(cherry picked from commit 1395343f11)
 2022-09-18 13:08:31 -04:00
Andreas 5d1dfb5290 Split source preferences from PreferencesHelper (#8029) 
(cherry picked from commit 30b3b2d3ff)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterPresenter.kt
 2022-09-18 13:08:22 -04:00
Andreas 41c9c20e26 Use 1.x preference abstraction (#8020) 
* Use 1.x preference abstraction

- Uses SharedPreferences compared to 1.x impl which uses DataStore but it breaks all settings screens currently
- Move PreferencesHelper to new PreferenceStore
  - PreferencesHelper should be split into smaller preference stores and be in core or domain
- Remove flow preferences as new PreferenceStore handles changes for us

Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>

* Fix PreferenceMutableState not updating

* Fix changes not emitting on first subscription

Co-authored-by: inorichi <3521738+inorichi@users.noreply.github.com>
(cherry picked from commit 0086743a53)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/source/interactor/GetEnabledSources.kt
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	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/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
 2022-09-18 12:31:49 -04:00
Weblate (bot) 432c6fc8a9 Translations update from Hosted Weblate (#7978) 
* Weblate translations

Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Maday <royalcoolness7898@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Tarık Yıldız <tariky113@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Vigge Beckmann <viggebeckmann@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/az/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/da/
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/es/
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/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
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/th/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hant/
Translation: Tachiyomi/Tachiyomi 0.x

* Deleted translation using Weblate (Tagalog)

Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Eric <hamburger1024@mailbox.org>
Co-authored-by: Giorgio Sanna <sannagiorgio1997@gmail.com>
Co-authored-by: ID-86 <id86dev@gmail.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Lzmxya <lzmxya@gmail.com>
Co-authored-by: Maday <royalcoolness7898@gmail.com>
Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Swyter <swyterzone@gmail.com>
Co-authored-by: Tarık Yıldız <tariky113@gmail.com>
Co-authored-by: TheKingTermux <achmadmaulana0233@gmail.com>
Co-authored-by: Vigge Beckmann <viggebeckmann@gmail.com>
Co-authored-by: altinat <poiiiii4yy@gmail.com>
Co-authored-by: stevenlele <stevenlele@outlook.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: arkon <eugcheung94@gmail.com>
(cherry picked from commit bc8c45832e)
 2022-09-18 11:50:21 -04:00