arkon
25b496ae14
Bump dependencies
...
(cherry picked from commit 6eb5a25ea1eb8d20b6532013d6562a38c0efbf8b)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
2023-12-23 18:57:50 -05:00
arkon
5dd041d470
Use immutable collections in more places
...
(cherry picked from commit 336221a972187c8e35d733d2f9d1d1a99e7b6f1b)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt
2023-12-23 18:54:37 -05:00
arkon
b5e1db1973
Use immutable collections in presentation-widget module
...
(cherry picked from commit 3c3b09209c7ea5729c29b9c3ad414c09b2bb9636)
2023-12-23 18:36:41 -05:00
arkon
5d565f436f
Minor cleanup
...
(cherry picked from commit 4a6571d310ecf2bf77e86a303f1788aaaab3df25)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt
# app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/SMangaExtensions.kt
2023-12-23 18:36:30 -05:00
Jobobby04
19746904e1
Some linting
2023-12-23 18:23:58 -05:00
arkon
9ab01ec20c
Add Compose lint checks
...
Still need to address most of them though.
(cherry picked from commit cb67f1de526e6120db363f67035966f365467912)
# Conflicts:
# presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt
2023-12-23 18:13:09 -05:00
Jobobby04
86837a6c47
Hopefully fix crash with page previews
2023-12-23 18:11:43 -05:00
arkon
28b980641c
Convert create backup dialog to a screen
...
Allows us more flexibility in adding more options/explanations in the future.
(cherry picked from commit 00b2853d3daaa49a2b3bcada1596e094e8da5156)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt
2023-12-23 17:51:38 -05:00
AntsyLich
8434d36498
ScanlatorFilterDialog: Fix crash when no scanlator ( #10111 )
...
(cherry picked from commit d7442d771b92b4d1b1c0c762ea6473cb58ece544)
2023-12-23 17:43:18 -05:00
arkon
07af2920ff
Group mode dialogs together in bottom reader bar
...
(cherry picked from commit 3a8aa3e8cd7b725ee73b7fe67d0b1c3111af977b)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
2023-12-23 17:42:51 -05:00
arkon
4687f81c42
Add separate default/apply buttons to reading mode/orientation selection dialogs
...
Related to #3453
(cherry picked from commit 9e67abcc8a1e7ca90c0a92acc563e998a7a99886)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
2023-12-23 17:41:21 -05:00
AntsyLich
e368116a30
Trim Chapter
scanlator value ( #10108 )
...
(cherry picked from commit d0bcd30909adaaf086e0bd5b0e8231561c4b9e0e)
2023-12-23 17:39:29 -05:00
AntsyLich
c8909961c0
Implement scanlator filter ( #8803 )
...
* Implement scanlator filter
* Visual improvement to scanlator filter dialog
* Review changes + Bug fixes
Backup not containing filtered chapters and similar issue fix
* Review Changes + Fix SQL query
* Lint mamma mia
(cherry picked from commit b97aa235480e35b5514b7b1489b9d4413cea66d9)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt
# data/src/main/sqldelight/tachiyomi/migrations/23.sqm
# data/src/main/sqldelight/tachiyomi/migrations/26.sqm
# domain/src/main/java/tachiyomi/domain/history/interactor/GetNextChapters.kt
2023-12-23 17:38:22 -05:00
arkon
94fa45597d
Replace custom preview annotation
...
(cherry picked from commit e6ca54fd04668fde5ae12429101a13dc1f03b99e)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
# app/src/main/java/eu/kanade/presentation/reader/PageIndicatorText.kt
2023-11-05 17:38:54 -05:00
arkon
e7aa8c31f1
Clean up reading mode / orientation enum classes
...
Categorizing the reading modes so we can implement a better
selection UI.
(cherry picked from commit 4502902fb0df21f637c905dc5c4c36625dedc710)
# Conflicts:
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
2023-11-05 17:36:37 -05:00
Ivan Iskandar
44bda0a611
MangaScreen: Adjust "missing chapter count" item list styling ( #10105 )
...
Text style to labelMedium and set secondary alpha to the whole row
(cherry picked from commit 5f34539525f93a92ca80f3b1fb9e71953b6758a1)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
2023-11-05 17:29:37 -05:00
arkon
d9a6a7be50
Restrict line length with ktlint
...
(cherry picked from commit 1d144e67678a99ec7198e5efcb1410b5da4bc42e)
# Conflicts:
# .editorconfig
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# source-local/src/androidMain/kotlin/tachiyomi/source/local/LocalSource.kt
2023-11-05 17:28:46 -05:00
arkon
0a9f15d74c
Postpone Android 8 requirement
...
(cherry picked from commit 4f3a0b352397bc6184962e0664d26731ffdd27f8)
2023-11-05 16:54:49 -05:00
arkon
ad1afdc529
Minor cleanup
...
(cherry picked from commit 056dbaefda791b53240265c8e9562a01f17118c4)
2023-11-05 16:54:32 -05:00
arkon
bd165456ae
Show EOL message if update check no-ops due to unsupported Android version
...
(cherry picked from commit 3a15c6b8438d1a740af0d6ffdec72347eec8cb83)
2023-11-05 16:54:23 -05:00
arkon
0232a65a26
No-op app update checks for Android < 8
...
This effectively makes it the last release for the older Android versions.
(cherry picked from commit db20d04c4b628a76dfdf7ce5e715ec2cf13de79a)
2023-11-05 16:54:14 -05:00
arkon
aaea2b1720
Ensure page indicator texts are centered
...
Maybe fixes #9976
(cherry picked from commit 4146c4c31d069ce9fb7ab36d72f1f8fa2be1e050)
2023-11-05 16:53:18 -05:00
arkon
3dc895778f
Move tracker binding logic to interactor
...
(cherry picked from commit 69223df27c198550a7c43dc1af4c65f85bcb395b)
2023-11-05 16:53:07 -05:00
arkon
f3fc4c7be1
Revert "Always save pages/covers in subfolders"
...
This reverts commit 8568d5d6c3ceae0084a350906b330f23dab571e1.
Closes #10052
(cherry picked from commit 4b225a4ff155dc019cf4db00b59d449e0db521ab)
2023-11-05 16:52:57 -05:00
arkon
91e6f7f79b
Bump dependencies
...
(cherry picked from commit 8644d90bd4572330e720c1eb8b64e3f323bbd709)
2023-11-05 16:52:34 -05:00
Ota
8496856941
New alphabetical chapter sort ( #10073 )
...
* added alphabetical chapter sorting
* Deleted sort_by_alphabet and re-utilized action_sort_alpha
* Accidentally deleted wrong string. Now solved
* Accidentally deleted wrong string. Now solved
Deleted sort_by_source instead of sort_by_alphabet in strings.xml.
Now reverted.
* Alphabetical sorting now uses Collator
* Clean up repeated Collator instances
---------
Co-authored-by: arkon <eugcheung94@gmail.com>
(cherry picked from commit f30ab56fd0a2a748f84dd698874cb16d7a61bd62)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
2023-11-05 16:52:23 -05:00
Caleb Morris
e14cc134a0
Added library sort by mean Tracker score ( #10005 )
...
(cherry picked from commit 5d91b77c9340604436c63073c83ad8b37794ddf0)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# domain/src/main/java/tachiyomi/domain/library/model/LibrarySortMode.kt
# domain/src/main/java/tachiyomi/domain/track/interactor/GetTracksPerManga.kt
2023-11-05 16:51:09 -05:00
arkon
43c5585f7e
Maybe fix foreign key error during some backup restores
...
(cherry picked from commit aca36f962516f04bbbac67c9bf54723a13076c1c)
2023-11-05 16:38:27 -05:00
AntsyLich
35d8c75aa0
Show missing chapter count between two chapters in chapter list ( #10096 )
...
* Show missing chapter count between two chapters in chapter list
Closes #8460
* Fix crash
* Lint
* Review changes
* Lint
(cherry picked from commit 6d538db5f2afc45976a65ae5d202a490d2e08352)
# Conflicts:
# app/src/main/java/eu/kanade/domain/chapter/model/ChapterFilter.kt
# app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterGetNextUnread.kt
2023-11-05 16:38:06 -05:00
Eshlender
aa2afd1402
Text on tabs Overflow Ellipsis ( #10095 )
...
* Update TabbedDialog to TabbedScreen
* clean
(cherry picked from commit b3d7c9247530c0522033b4a9130d252bcbf50163)
# Conflicts:
# presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt
2023-11-05 16:30:02 -05:00
Eshlender
3dd8aeafe5
Combining manga information into a function ( #10093 )
...
* Combining manga information into a function
* clean space
* indexes
* context
* clean
* textAlign for Tablet Mode
(cherry picked from commit d862d83511d6bc7dee53609bcac77c20b01bc795)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
2023-11-05 16:29:34 -05:00
Howard Wu
9d2cf4fd60
buildDir deprecated, use layout.buildDirectory instead ( #10097 )
...
gradle/gradle#20210
gradle/gradle#24820
(cherry picked from commit 8a1625ec7906a3f396d0f217cd8c168f539b5167)
2023-11-05 16:28:42 -05:00
arkon
6eac922cbf
Use same icon as chapter list items to indicate downloaded chapter in reader transitions
...
(cherry picked from commit 2ee895ee3c09004666652181fedd653f4aeeb90f)
2023-11-05 16:28:31 -05:00
arkon
cde00282c1
Add basic storage usage info to "Data and storage" settings screen
...
(cherry picked from commit cb8ea5eab0ec68ea02e8dc98c0a52771c460d5ab)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
2023-11-05 16:28:14 -05:00
Jobobby04
1202409b25
Merge branch 'release'
...
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
# app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
# app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/exh/EXHMigrations.kt
# app/src/main/java/exh/debug/DebugFunctions.kt
2023-10-29 19:03:29 -04:00
Jobobby04
caaa7a53bc
Fix release migrations
2023-10-29 18:55:21 -04:00
Jobobby04
2f9cba87b5
Release v1.9.4
2023-10-29 18:45:34 -04:00
Jobobby04
6ba8318b8a
Fix page previews cache
...
(cherry picked from commit d600ddc11ad496ab5c8b879b18e6bb1187a05799)
# Conflicts:
# app/build.gradle.kts
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/java/exh/EXHMigrations.kt
# app/src/main/java/exh/debug/DebugFunctions.kt
2023-10-29 18:44:01 -04:00
Jobobby04
7565e51f95
Fix page previews after E-H update
...
(cherry picked from commit d45563e58d7f5f8f50046e0dbb8dc2e147ac0789)
2023-10-29 18:26:42 -04:00
Jobobby04
230aec370c
Fix import of reader preferences in reader
...
(cherry picked from commit 90281affc4bcd12c07cb036f948497002f78c197)
2023-10-29 18:26:35 -04:00
Luqman
099758f02d
Fix Mangadex recommendation ( #951 )
...
* Fix Md recs
Disable Md recs if delegated setting is disabled
* Revert "Fix Md recs"
This reverts commit 7dbfa662be2665aa97664720df42e2562bc4adb0.
* Rerun
This reverts commit 971315278b92bcabfbf6b5610cb1c63e281bc172.
(cherry picked from commit 6baa24273a098f492a11efe29e93ef3f64cfd951)
2023-10-29 18:25:43 -04:00
AntsyLich
e0480ce8c3
pain ( #968 )
...
(cherry picked from commit 8fc04d8cc6ff7cf0135b9facbb57072614a2f9b2)
2023-10-29 18:25:23 -04:00
Jobobby04
4cab34e06c
Use readableAt
...
(cherry picked from commit d37463cf0f091ade15fa80c7b75fe378a45eee61)
2023-10-29 18:23:41 -04:00
arkon
3aefee3ce0
Update website links
...
(cherry picked from commit ccc9a5a052b133174f8ba361490386ff0361283e)
(cherry picked from commit bc5ba6092b3ec2f2cd5eae5a5a80fec7bf23f414)
# Conflicts:
# CONTRIBUTING.md
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsScreenModel.kt
2023-10-29 18:22:46 -04:00
arkon
72ac3c275c
Avoid opening blobs as webpages
...
Fixes #10060
(cherry picked from commit 548f7f415a28529522f5aef0d53546e8bc68957e)
(cherry picked from commit 7ccb8eaaf24d5621f831826afd56210c6d93f2c7)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt
2023-10-29 18:19:32 -04:00
Vlasov Roman
d14cf0ccea
Change Shikimori domain from ".me" to ".one" ( #10027 )
...
(cherry picked from commit 8f3681d79f1624a092e5c356c9459897f4220c29)
(cherry picked from commit 2ba546009637f2a8a58fc59805a9ddac659abee8)
2023-10-29 18:17:25 -04:00
arkon
c2963709cd
Use consistent extension icon URLs
...
Better caching between versions.
(cherry picked from commit 30f845139d76762798e2cdec7804a38806c3eeca)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
(cherry picked from commit 01e0c3c0401daec57e565b5bf5341e45f78c98d5)
2023-10-29 18:17:06 -04:00
Luqman
6baa24273a
Fix Mangadex recommendation ( #951 )
...
* Fix Md recs
Disable Md recs if delegated setting is disabled
* Revert "Fix Md recs"
This reverts commit 7dbfa662be2665aa97664720df42e2562bc4adb0.
* Rerun
This reverts commit 971315278b92bcabfbf6b5610cb1c63e281bc172.
2023-10-29 18:13:52 -04:00
Luqman
674d95b783
Shorter Chapter List in Reader ( #955 )
2023-10-29 18:13:25 -04:00
AntsyLich
8fc04d8cc6
pain ( #968 )
2023-10-29 18:12:04 -04:00