Commit graph

3377 commits

Author SHA1 Message Date
Riztard Lanthorn
d9ea621e54
add Yin Yang Theme (#5508)
* add Yin Yang Theme

* change download badge color to yin yang as well

* update string

* fix &
2021-07-08 09:12:23 -04:00
SBence
fb35d7af59
Sanitize manga title in page download subfolder name (#5514) 2021-07-07 21:58:53 -04:00
Andreas
c254aa6fcc
Make Automatic Reader Theme pick background/text color based on dark mode preference (#5505)
* Make Automatic Reader Theme pick background/text color based on theme

* Use extension method
2021-07-07 18:12:11 -04:00
Ivan Iskandar
37d30eb887
Simplify locale override (#5509) 2021-07-07 18:11:52 -04:00
w
49cdcc644c
Update image decoder to add JPEG XL support (#5512) 2021-07-07 18:11:20 -04:00
arkon
07e5525c74 Fix chapter source order not working correctly and allow refresh to update source order
Based on 00f916a4f0

Co-authored-by: CarlosEsco <CarlosEsco@users.noreply.github.com>
2021-07-07 18:07:51 -04:00
arkon
776194f5b2 Only update in-library manga chapter settings instead of all 2021-07-07 18:05:29 -04:00
arkon
ed80ee98a7 Sanitize spaces when setting URLs without domain
It throws an URISyntaxException otherwise.
2021-07-07 17:53:28 -04:00
arkon
040bac3da2 Resource cleanup post-theme removal 2021-07-04 17:51:15 -04:00
arkon
9df721d158 Add DARK_BLUE enum value back to avoid crash 2021-07-04 17:38:54 -04:00
arkon
c50ede8b2c Add back android-process-button library
wtf Android Studio, thanks for lying to me.
2021-07-04 12:20:32 -04:00
arkon
ba0907ae59 Update dependencies; remove unused android-process-button library 2021-07-04 12:16:12 -04:00
arkon
e9dce32a98 Remove Hot Pink theme
The old AMOLED Hot Pink theme is pretty close to what Midnight Dusk + AMOLED is now.
2021-07-04 12:05:53 -04:00
arkon
535cc0d81e Rename "Dark Blue" theme to "Blue" 2021-07-04 12:05:11 -04:00
arkon
51a33a47cd Revert accidentally committed stuff (oops) 2021-07-03 12:52:07 -04:00
arkon
01a1a9ebab Update to Conductor 3.0.0 2021-07-03 12:50:10 -04:00
arkon
438bad9649 Fix category selected state
Co-authored-by: ivaniskandar <ivaniskandar@users.noreply.github.com>
2021-07-03 12:09:05 -04:00
arkon
fe3b36caeb Fix some views being click-through-able 2021-07-03 11:11:34 -04:00
Ivan Iskandar
64b1c9636b
Track search dialog adjustments (#5479)
* Add clear text button to track search dialog text input

* Track search item adjustments
2021-07-03 09:44:12 -04:00
FourTOne5
db0c1b2634
Sort Installed, Update, Untrusted Extenion by Name in Extensions Tab (#5486)
* Update ExtensionPresenter.kt

* Update ExtensionPresenter.kt

* Update ExtensionPresenter.kt
2021-07-03 09:43:29 -04:00
arkon
568c4d8c8e Use current locale when sorting library "alphabetically" (closes #5281)
This _should_ handle things like Chinese that aren't actually alphabetical.
2021-07-02 22:48:16 -04:00
arkon
d645507eeb Update dependencies 2021-07-02 22:47:25 -04:00
arkon
3548112ab2 Update delete history icon (closes #5482) 2021-07-02 22:19:07 -04:00
arkon
0cb042cd93 Remove en-GB option since we don't actually localize different English locales 2021-07-02 09:02:28 -04:00
Ivan Iskandar
0eadc028b6
Merge light and dark themes (#5470)
* Merge AMOLED and regular dark themes

This allows all variants of dark themes to use black backgrounds as a
separate preference.

* Merge light and dark themes

* Fix ReaderSeekBar color on Dark Blue theme

* Color fixes

* Fix Dark Blue bars ripple

* Simplify night mode check
2021-07-02 08:44:04 -04:00
Ivan Iskandar
82f3677168
Fix reader toolbar alpha applied to other components outside its activity (#5483) 2021-07-01 18:11:44 -04:00
stinky-lizard
70ed49e478
Imported implementation for updating library by next expected update from Neko (#5436)
* Imported implementation for updating library by next expected update from Neko. This sort uses the last 4 updates for a manga to compute an average time between updates and then extrapolates when the next update should occur.

Currently seems to work perfectly. However, I may have silently messed something up along the way.

All code and algorithms are credited to kyjibo on GitHub. The original commit adding this functionality is here: 681003926a

* Imported implementation for updating library by next expected update from Neko. This sort uses the last 4 updates for a manga to compute an average time between updates and then extrapolates when the next update should occur.

Currently seems to work perfectly. However, I may have silently messed something up along the way.

All code and algorithms are credited to kyjibo on GitHub. The original commit adding this functionality is here: 681003926a

* Remove commented-out line from LibraryUpdateRanker

I missed removing this when first committing. The removed line is a holdover from Neko, which requires 7+, but I removed the function that requires this.
2021-07-01 18:11:21 -04:00
Andreas
3c67a36b60
Change wording for "Per-category display setting" (#5484) 2021-07-01 09:03:54 -04:00
Ivan Iskandar
cb71d44024
Tracking sheet and search adjustments (#5427)
* Tracking sheet and search visual adjustments

* Remove track item divider

* Add start margin to "add tracking" button

* Fix track search dialog crash when no item chosen

* Show "remove" action only when track item is previously set

* Remove placeholder for total chapters

* Cleanups

* Add track search error/empty result message

* Make track search dialog fullscreen

* Use AutofitRecyclerView for track search dialog

* Fix text input overlapping

* Run track search from IME action instead

* Remove deprecated method

* Reformat

* Set track search error message on the placeholder

* Use payload to notify track search item change

* Fix track search action icon tint color
2021-06-28 11:33:26 -04:00
curche
7e3ea9074c
Extend library search by adding -<source> option (#5387)
* extend library search to enable -<source> search

library search already allows for <source> search to select manga from a
particular source. Similarly, -<source> allows to search for manga that
aren't from the said source. TachiyomiSy has this feature but it heavily
depends on exh methods

A problem when you directly add a negation check is that although
it will work, the genre search kicks in adds back every manga since
-<source> returns true for all genres of a manga

Thus, the solution I decided on was do source search first, and then
move to genre check when it fails. A perhaps useful addition is that,
now you're able to search like this:
 <genre1>, -<source>, -<genre2>

* make if-else statements more readable

* refactor containsSourceOrGenre() using `when`

* add comment describing the function

* remove lazy

not really required anymore now that containsSourceOrGenre was rewritten
using `when`
2021-06-28 11:32:03 -04:00
Ivan Iskandar
e2cf157857
Reader fixes after #5450 (#5465)
* Fix ReaderActivity system bars behavior

* Fix ReaderActivity transition view text color

* Don't change reader navbar color when windowLightNavigationBar is not available
2021-06-27 11:39:26 -04:00
Andreas
60890147c3
Sort per category (#5408)
* Add flags for sorting per category

* Add logic to LibrarySettingsSheet

* Add  logic to LibraryPresenter

* Minor tweaks

* Use enum instead of variables

Also deprecates LibrarySort in favour of the new enum classes

* Remove debug log and suppress deprecation

* Convert DisplayMode setting to enum

Also fix bug were adapter would get de-synced with the current per category setting

* Fix migration crashing app due to values being access before migration
2021-06-26 13:30:16 -04:00
Ivan Iskandar
64c95305b9
Match ReaderActivity theme with the rest of the app (#5450)
* Match ReaderActivity theme with the rest of the app

* Fix viewer inset when fullscreen reader is off

* Fix incorrect toolbar color after recreate

* Remove animated inset

* Move isDarkMode to PreferencesHelper
2021-06-25 23:28:19 -04:00
Soitora
88fd799a30
Add favorited badge to browse and search (#5440) 2021-06-22 18:22:59 -04:00
inorichi
ef937f277e Update image decoder with better AVIF support 2021-06-22 12:58:35 +02:00
Ivan Iskandar
c3fb5af3fc
Fix issues on older API versions and tablets (#5433)
* Fix tablet's navigation rail and toolbar color

* Fix tracking sheet crash on older APIs

* Fix settings crash on older APIs
2021-06-20 11:05:37 -04:00
Ivan Iskandar
932c92412c
More themes cleanup (#5410)
* More themes cleanup

* Tweak some things

* Fix 'Clear History' icon

* Split out ripple colored to its own drawable

* Tidy up things

* Unify background dim amount

* Use primaryColor for Account login button

* More colored ripples

* use colorOnPrimary for selected comfortable library item title

Co-authored-by: Soitora <simon.mattila@protonmail.com>
2021-06-19 15:45:16 -04:00
Riztard Lanthorn
05771ddf6d
add start download now (#5386)
* add start download now

download now for selected chapter
from j2k

Co-Authored-By: Jays2Kings <jays@outlook.com>

* change string to action

* move to bottom

* oopsie

Co-authored-by: Jays2Kings <jays@outlook.com>
2021-06-19 12:36:29 -04:00
Hunter Nickel
848d387ec4
Add AlertDialog styles to Reader themes (#5426) 2021-06-19 12:34:23 -04:00
jmir1
ac6b4235b9
Fix crash when opening the MangaController from... (#5419)
...the browse search
null safe cast to TextView because when searching for manga in a source,
the toolbar has no children and
find() returns null.
2021-06-18 19:46:45 -04:00
Ivan Iskandar
ab73e98075
Fix incorrect toolbar text color after theme change (#5388) 2021-06-17 08:53:38 -04:00
Soitora
aecdd04e04
Move "Delete sweep" out from overflow (#5392)
Places it as its own icon, having an overflow with only one item doesn't make much sense when that's not the behavior in other parts of the app.
2021-06-16 18:31:20 -04:00
arkon
e5cdf74587 Downgrade WorkManager
Related to #5364
2021-06-14 17:07:38 -04:00
arkon
8d25ce7323 Surface exceptions when fetching pages properly (fixes #5377) 2021-06-12 10:49:30 -04:00
Hunter Nickel
8deca3b63a
Added text to category changing dialog when shown with no categories (#5345)
* Added text to ChangeMangaCategoriesDialog if invoked with empty category list

* Change dialog text, add negative button, and change positive button to open CategoryController

* Tiny bit of code cleanup and reorganizing
2021-06-12 09:48:11 -04:00
Zakhar Timoshenko
9b967177c5
Added "Yotsuba" theme (#5290) 2021-06-12 09:45:49 -04:00
Soitora
4dfb3cc972
Improvements to the new library item selectors (#5379)
* Increase card selector radius

* Add themed overlay to library selector
2021-06-12 09:45:26 -04:00
Ivan Iskandar
73e5e9ecd9
Add background to draggable items (#5353) 2021-06-09 17:16:59 -04:00
Soitora
653b7ffcd0
Fix black icon for small notifications on EMUI (#5350)
* Set notification icon fillColor to Android white

Closes #5340

* Remove '_black' suffix from the glasses icon drawable
2021-06-09 17:16:09 -04:00
jmir1
8791b72cb1
Fix library settings sheet causing app to crash... (#5354)
...when the category list is empty
2021-06-09 17:15:48 -04:00
Andreas
d961492380
Add back missing start/end margins in manga info header (#5352)
* Add missing margin to phone UI

Also, remove unnecessary code

* Add missing margin to tablet UI

* Use LinearLayout instead
2021-06-09 17:14:57 -04:00
arkon
07de367476 Revert "Set background job expedited policies"
This reverts commit c69420373a.

Caused crashes in TachiyomiSY for some reason. Will have to redo this once we target Android 12.
2021-06-09 17:11:23 -04:00
Ivan Iskandar
31d96c2bf0
Fix download status not updated properly after starting batch download (#5348) 2021-06-08 11:18:56 -04:00
Ivan Iskandar
fb8aafb69f
Enable secure screen when incognito mode is enabled (#5339)
* Enable secure screen when incognito mode is enabled

* Fix incognito banner not showing up after configuration changes
2021-06-07 22:41:12 -04:00
Soitora
3d58b78062
Add ripple to history items (#5341)
- Replaces margin with padding.
- Adds the drawable ripple background.
- Changes height to match the padding so it doesn't look odd.
2021-06-07 22:40:48 -04:00
arkon
ec5e6958ef Show global update error notifications by default 2021-06-06 22:27:53 -04:00
arkon
71bd5fe367 Fix crash on source page load error 2021-06-06 22:27:28 -04:00
Andreas
6385c71c72
Fix gradient not being smooth (#5329) 2021-06-06 18:20:43 -04:00
arkon
d43255e688 Draw tablet manga info column under navbar (fixes #5323) 2021-06-06 10:50:00 -04:00
Ivan Iskandar
3527dedc99
Coil: Caching adjustments (#5311)
* Coil: Enable disk cache for source items

* MangaCoverFetcher: Let Coil's OkHttp client handle caching for non-library cover
2021-06-06 10:30:26 -04:00
Andreas
de50f53be4
Fix title jumping around when refreshing (#5328) 2021-06-06 10:29:28 -04:00
arkon
f2e4b2fc99 Get appropriate download link based on CPU ABI 2021-06-05 18:30:04 -04:00
arkon
e6f3cd03bb Use coroutine job for fetching next source page 2021-06-05 18:02:59 -04:00
arkon
a1e31549a2 Add shortcut to tracking guide on website 2021-06-05 18:01:34 -04:00
arkon
71d225c562 Address some build warnings 2021-06-05 17:49:20 -04:00
arkon
7c23212850 Don't expand source filter sheet on show (closes #5253) 2021-06-05 11:08:54 -04:00
Hunter Nickel
fdf178d4df
Add behavior for modifying reader buttons depending on prev/next chapters (#5305) 2021-06-05 10:37:21 -04:00
arkon
04ebca8413 Use smallest width instead of width for alt layouts 2021-06-05 10:25:54 -04:00
arkon
edeee54fb2 Set orientation icon correctly when opening reader 2021-06-05 10:25:54 -04:00
Andreas
a906e9b302
Added category-wise display setting (#5232)
* Added category-wise display setting

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>

* Use flag instead of preference

* Remove database call in LibraryItem

* Remove unnecessary code

Co-authored-by: Rogavactive <30288842+Rogavactive@users.noreply.github.com>
2021-06-05 10:25:34 -04:00
arkon
fff72b61df Fix image type build error 2021-06-04 23:46:18 -04:00
arkon
74381ef59e Handle HEIF images (partly addresses #4756) 2021-06-04 23:26:37 -04:00
Hunter Nickel
64f95af3e5
Add check for backstack size before pushing DownloadController (#5312) 2021-06-04 18:52:30 -04:00
Andreas
85a1eb75c9
Make cover bigger on tablet UI (#5296)
* Make cover bigger on tablet UI

Also fix bug when opening from source

* Use ISO A5 ratio on tablet UI

* Change design

* Fix bug that happened when refreshing
2021-06-04 18:51:43 -04:00
jobobby04
597cec3064
Legacy backup conversion to Kotlin Serialization (#5282)
* Legacy backup conversion to Kotlin Serialization

* Fix BackupTest compiling
2021-06-04 18:50:22 -04:00
arkon
b03ebc1fa4 Update tablet UI
- Only used when width is >= 720dp instead of 600dp (typically 10" tablets)
- Fix fastscroll in manga view (fixes #5267)
2021-06-03 23:00:41 -04:00
arkon
6c53bb4d51 Allow center aligned side nav icons (closes #5177) 2021-06-03 09:30:50 -04:00
arkon
fb7a458747 Address some build warnings 2021-06-02 23:17:41 -04:00
arkon
db25a9ae4f Support AVIF and HEIF images (closes #4756)
Co-authored-by: inorichi <inorichi@users.noreply.github.com>
2021-06-02 22:59:02 -04:00
arkon
c69420373a Set background job expedited policies 2021-06-02 22:58:03 -04:00
arkon
2b8347f899 Update dependencies 2021-06-02 22:51:26 -04:00
arkon
281a3911f6 Add share and save cover actions (closes #3011) 2021-06-02 22:51:10 -04:00
OncePunchedMan
9b77dd9a2b
add AMOLED prefix to theme name (#5263) 2021-06-01 18:15:54 -04:00
arkon
cb8cff3179 Run formatter 2021-06-01 18:01:23 -04:00
Andreas
3db85c7274
Tap to enlarge cover (#5256)
* Convert manga_info_header to use ContraintLayout

Will help with MotionLayout and tablet layout

* Convert to MotionLayout to be able to enlarge cover art

* Add keyframes to animations

* Remove keyframes

Alexa play Despacito

* Add back manga_summary_section
2021-06-01 17:59:38 -04:00
curche
b41ac355a0
add long click to view manga in Migration Source Search (#5241)
apparently was added to Sy in 8686fecb1f
added it for main as well

Co-Authored-By: jobobby04 <jobobby04@users.noreply.github.com>

fixes https://github.com/tachiyomiorg/tachiyomi/issues/5027
2021-06-01 17:58:10 -04:00
Soitora
88d9ffe92e
Add better library item selectors (#5240)
* Add better library item selectors

Inspired by the J2K method of library item selection.

* Tweak theme selection colors

It was missing for Hot Pink and Midnight Dusk.

The selector color is 75% alpha of the color accent, this looked fitting for all themes.
2021-06-01 17:56:36 -04:00
arkon
5113c78ab6 Consolidate some of the app update classes
We only use GitHub for all update checks, so the abstraction isn't useful.
2021-06-01 17:54:34 -04:00
arkon
3854995ef2 Address some Kotlin language warnings 2021-06-01 17:53:51 -04:00
arkon
36e14b951a Only show automatically refresh trackers setting if logged in to some trackers 2021-06-01 17:49:04 -04:00
arkon
9299a4beff Generate APKs per CPU architecture 2021-06-01 09:55:10 -04:00
arkon
d681bea395 Revert "Revert "Revert "Temporarily hide Komga tracker"""
This reverts commit 79ab492a5b.

lol
2021-05-31 19:36:46 -04:00
arkon
0f3f1e9226 Release 0.11.1 2021-05-31 19:35:52 -04:00
arkon
79ab492a5b Revert "Revert "Temporarily hide Komga tracker""
This reverts commit 7be2cbb75b.
2021-05-31 19:35:10 -04:00
arkon
62db4bb09d Fix missing Injekt method crash (fixes #7355) 2021-05-31 19:34:54 -04:00
arkon
7be2cbb75b Revert "Temporarily hide Komga tracker"
This reverts commit 31997fe50a.
2021-05-31 18:46:45 -04:00
arkon
5b1fe3460f Release 0.11.0 2021-05-31 18:46:30 -04:00
arkon
31997fe50a Temporarily hide Komga tracker 2021-05-31 18:46:09 -04:00
arkon
5e5ceef122 Update some icons 2021-05-30 17:24:57 -04:00
Jozef Hollý
40edbac7f0
Weblate translations (#5141)
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dhimas Admaja <dhimasadmaja@gmail.com>
Co-authored-by: Elosy <gaudic99@gmail.com>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: HeavenShadow <heavenshadow@outlook.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Jozef Hollý <j2.00ghz@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Wojciech Kosztyła <wojtex1221@gmail.com>
Co-authored-by: matdeluis <luisdebonoir@protonmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: whenwesober <naomi16i_1298q@cikuh.com>
Co-authored-by: Роман <Rozhenkov69@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/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
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/hr/
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/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
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/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
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/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: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Dhimas Admaja <dhimasadmaja@gmail.com>
Co-authored-by: Elosy <gaudic99@gmail.com>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: HeavenShadow <heavenshadow@outlook.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jetspectre <jetspectre1@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Samuel Carvalho de Araújo <samuelnegro12345@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Wojciech Kosztyła <wojtex1221@gmail.com>
Co-authored-by: matdeluis <luisdebonoir@protonmail.com>
Co-authored-by: monolifed <monolifed@protonmail.com>
Co-authored-by: whenwesober <naomi16i_1298q@cikuh.com>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
2021-05-30 17:24:40 -04:00