Jobobby04
16d433973c
Finish migration to moko resources
2023-12-23 22:40:54 -05:00
arkon
82098460ff
Replace remaining Android-specific strings
...
Also renaming the helper composables so it's a bit easier to find/replace everything
in forks.
(cherry picked from commit 0d1bced1226878336f8156671ae0c224c02f2604)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
# app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.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/presentation/reader/components/ChapterNavigator.kt
# app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.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/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
2023-12-23 20:31:05 -05:00
arkon
1eccf9fad8
Migrate to multiplatform string resources ( #10147 )
...
* Migrate to multiplatform string resources
* Move plurals translations into separate files
* Fix lint check on generated files
(cherry picked from commit 46e734fc8eefb8c06a880194e702559ca3fa769d)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
# app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
# app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBrowseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/data/CreateBackupScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.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/presentation/reader/components/ChapterNavigator.kt
# app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
# app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoryTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.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/ReaderActivity.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
# build.gradle.kts
# i18n/build.gradle.kts
# i18n/src/commonMain/resources/MR/base/strings_sy.xml
# i18n/src/commonMain/resources/MR/fr/strings_sy.xml
# i18n/src/commonMain/resources/MR/in/strings_sy.xml
# i18n/src/commonMain/resources/MR/pt-rBR/strings_sy.xml
# i18n/src/commonMain/resources/MR/ru/strings_sy.xml
# i18n/src/commonMain/resources/MR/zh-rCN/strings_sy.xml
# i18n/src/commonMain/resources/MR/zh-rTW/strings_sy.xml
2023-12-23 20:28:29 -05:00
Ivan Iskandar
adfaa75ae9
Remove animateItemPlacement modifier usage ( #10146 )
...
(cherry picked from commit 69aa13bc5655813f1366b2020343091c8d2da009)
2023-12-23 19:25:53 -05:00
Jobobby04
8effc7eb05
Fix build
2023-12-23 19:25:12 -05:00
arkon
91d45cc8b9
Address more Compose lint warnings
...
(cherry picked from commit 2c032ff70d607f0e0197091e53763491775a0ab3)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
# app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
# app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt
# app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt
2023-12-23 19:24:57 -05:00
arkon
adb53a9a45
Migrate to standard M3 TabIndicator
...
(cherry picked from commit 0af4703b78007b117a233c03b9f5e9be2b8e3ab0)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt
2023-12-23 18:59:15 -05:00
Ivan Iskandar
97f33888d2
Migrate deprecated progress indicator components ( #10142 )
...
(cherry picked from commit 9ec0f73e8778f18001704a6da3a1ac184027efb9)
2023-12-23 18:58:16 -05:00
Ivan Iskandar
4660e2cf8f
Migrate deprecated tooltip components ( #10141 )
...
(cherry picked from commit f9fb034330d6e5c4f0cf9232649aa9a548e9e443)
2023-12-23 18:58:06 -05:00
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
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
6ba8318b8a
Fix page previews cache
...
(cherry picked from commit d600ddc11a )
# 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 d45563e58d )
2023-10-29 18:26:42 -04:00
Jobobby04
230aec370c
Fix import of reader preferences in reader
...
(cherry picked from commit 90281affc4 )
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 6baa24273a )
2023-10-29 18:25:43 -04:00
AntsyLich
e0480ce8c3
pain ( #968 )
...
(cherry picked from commit 8fc04d8cc6 )
2023-10-29 18:25:23 -04:00
Jobobby04
4cab34e06c
Use readableAt
...
(cherry picked from commit d37463cf0f )
2023-10-29 18:23:41 -04:00
arkon
3aefee3ce0
Update website links
...
(cherry picked from commit ccc9a5a052b133174f8ba361490386ff0361283e)
(cherry picked from commit bc5ba6092b )
# 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 7ccb8eaaf2 )
# 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 2ba5460096 )
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 01e0c3c040 )
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
Shamicen
d502ebc275
Fixed avif/encrypted thumbnails not loading ( #966 )
...
* Fixed avif/encrypted thumbnails not loading
* used new input stream instead of byteArray
2023-10-29 18:11:16 -04:00
arkon
20e9ea7725
Don't include "app state" preferences in backups
...
(cherry picked from commit ce7bf396ebc0b85d0e857c55b27cb5eab2ad9d5b)
# Conflicts:
# app/build.gradle.kts
2023-10-29 15:29:03 -04:00
arkon
23d683133b
Record time when last automatic backup was created
...
Closes #3474
(cherry picked from commit 1aa5222c99f50543c47d5f3bd4bb892e16e31efb)
2023-10-29 13:52:59 -04:00
arkon
32c98b9c50
Abstract out library last updated timespan text
...
So we can reuse it for showing last automatic backup time.
(cherry picked from commit 298c49f3ab7000ed0457aa177bba9a98072b1339)
2023-10-29 13:52:45 -04:00
arkon
dfb3e2da8e
Clean up chapter restoring logic a bit
...
(cherry picked from commit ce5e10be955d8166f53de8118f8f12e76546b5ea)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# domain/src/main/java/tachiyomi/domain/history/interactor/GetNextChapters.kt
2023-10-29 13:52:28 -04:00
arkon
5f7d56b6d2
Try to ensure that reader page error message is removed if image is loaded
...
Maybe fixes #5687
(cherry picked from commit 4868dd2d03214d0b1307cb42abd3e0a4cb5e85c6)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
2023-10-29 12:58:07 -04:00
arkon
ee212460b3
Add option to flash white screen on page change in reader for e-ink displays
...
Closes #2123
(cherry picked from commit 443d56f69bc1df515ed2edcd5b2936ed8710fb71)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt
# app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2023-10-29 12:57:02 -04:00
Eshlender
6fa77fe894
Add icons for author and artist in MangaInfoHeader ( #10079 )
...
* Mark author and artist
* overall style
* Clean up spacing
---------
Co-authored-by: arkon <eugcheung94@gmail.com>
(cherry picked from commit 7457a18aee15ce7b2afd01fc5bc33f08baa2f6f1)
2023-10-29 12:55:34 -04:00
arkon
80a07631bf
Add ability to reset chapter flags to defaults
...
Closes #10063
(cherry picked from commit 118d3b7fcc5cf8a27e52ff690cb3ecd28860c10c)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
# data/src/main/sqldelight/tachiyomi/data/mangas.sq
2023-10-29 12:55:08 -04:00
arkon
47f9bf08cc
Replace AppUpdateService with a WorkManager job
...
Fixes #7773
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit eed57b80be077a9f73c36d8dc572f34f59c1ba8d)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateService.kt
2023-10-29 12:47:28 -04:00
arkon
20352e3f10
Rename "Backup and restore" settings screen to "Data and storage"
...
We can house more things in here in the future, like:
- A unified storage location setting (with scoped storage)
- Sync
- Disk usage info
(cherry picked from commit c46c39d4aea887503838cc832822047f3a41018a)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt
2023-10-29 12:46:31 -04:00
AntsyLich
2e2f5264e5
Yeet app update download progress notification on complete ( #10071 )
...
(cherry picked from commit 17b90d2491c63a43dba147e93d4e6d0ea54984fd)
2023-10-29 12:43:48 -04:00
arkon
927f6105bf
Set saved image date modified value to current time
...
Fixes #10070
(cherry picked from commit 9ecec5d468629f647f7c6370c78983d5bcf5b670)
2023-10-29 12:43:34 -04:00
Seishirou101
1d6266c578
Add info about problematic extensions to debug logs ( #10059 )
...
* add ext info to crashlog
* add unofficial to crashlog too
* update to have header include unofficial too
* after ktlintFormat
* Clean up debug info output
---------
Co-authored-by: arkon <eugcheung94@gmail.com>
(cherry picked from commit 0bdd3f79d4d14318ba8110748c6d39484c6d446b)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/util/CrashLogUtil.kt
2023-10-29 12:43:21 -04:00
arkon
fd02759a56
Handle reader app bar insets in Compose
...
(cherry picked from commit 8057f067b964835897a2365cee0307cfdc1472f6)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
2023-10-29 12:41:16 -04:00
arkon
7ccb8eaaf2
Avoid opening blobs as webpages
...
Fixes #10060
(cherry picked from commit 548f7f415a28529522f5aef0d53546e8bc68957e)
2023-10-29 12:37:45 -04:00
arkon
d949e738f0
Migrate reader low brightness overlay to Compose
...
(cherry picked from commit d9c0b1ce7d1739da3945622f2d18b171a471fc2e)
# Conflicts:
# 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-10-29 12:37:30 -04:00
arkon
ae6586be2b
Add Compose previews for reading and orientation mode dialogs
...
(cherry picked from commit 0a0b6861190b087776e60e8e20b5cb21d7e2a855)
2023-10-29 12:35:31 -04:00
Caleb Morris
88efcb5c01
Detached permission request from DiskUtil ( #10051 )
...
Being an extension on the DiskUtil couples to a class at a different abstraction
layer without really needing to. Created PermissionRequestHelper as a place to
put similar requests if needed in the future.
(cherry picked from commit 3b7ed9bc6d99c9822f3051f3696fb8359b4a8f8a)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
2023-10-29 12:34:05 -04:00
Jobobby04
1a3371352c
Fix build
2023-10-29 12:32:58 -04:00
arkon
59a6fd7dca
Update Voyager
...
(cherry picked from commit 012854dd1e13eedecd92419fd6a4d1d5cc900462)
# Conflicts:
# app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.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/LibrarySettingsScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
2023-10-29 12:32:40 -04:00
Caleb Morris
41920d9e75
[dev QoL] Added AndroidStudio previews for [presentation.track] namespace ( #10022 )
...
* Created DummyTracker for use in tests and presentation previews
* Added previews for TrackerSearch
* Added previews for TrackLogoIcon
* Added preview for TrackInfoDialogSelector
* Added previews for TrackInfoDialogHome
(cherry picked from commit 6d1e520c6c5c3860bbd588677bb4a05ab06fe830)
2023-10-29 11:51:34 -04:00
Joshua Owolabi
325a471359
Allow extensions to open manga or chapter by URL ( #9996 )
...
* open manga and chapter using URL
* removing unnnecessary logs
* Resolving comments
* Resolving comments
(cherry picked from commit f84868a2641578b7e07719d8f580e4668804fd50)
2023-10-29 11:50:20 -04:00
Caleb Morris
48ef273fb2
Changed data-mappers to use function format ( #10045 )
...
The lambda-format was really confusing to read and keep which anonymous data
item was corresponding to which field. Now it's directly inspectable in the IDE
(cherry picked from commit 15423bfc8476179dff20ed49e5aa92a5387061ff)
# Conflicts:
# data/src/main/java/tachiyomi/data/chapter/ChapterRepositoryImpl.kt
# data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
# data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt
# data/src/main/java/tachiyomi/data/updates/UpdatesMapper.kt
# data/src/main/java/tachiyomi/data/updates/UpdatesRepositoryImpl.kt
2023-10-29 11:50:07 -04:00
Caleb Morris
eee1f34ed2
Decoupled Tracker Interface ( #10042 )
...
Split out Tracker to interface and created simple dummy instance for previews
(cherry picked from commit 3a35c13575330e755a81aa550e76c115f69a649a)
2023-10-29 11:10:53 -04:00
arkon
d3ad5d6890
Refresh tracks before updating progress
...
Closes #1652
Also removes the ability to trigger refreshes for the entire library or
as part of a library update as it should no longer be needed. Opening
the tracking sheet already refreshes the data too, so stale data is
irrelevant there.
Also closes #4775 since it would no longer be relevant.
(cherry picked from commit 489d22720a4343f198c81fe10f69d5b212bfc41a)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt
2023-10-29 11:08:08 -04:00
Jobobby04
a4ff56e6eb
Build fixes
2023-10-29 11:06:23 -04:00
arkon
ada9239c11
Consistent labeled checkbox composable
...
(cherry picked from commit c53172265b4dfba380a096c8d9107358515bf0e1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
2023-10-29 11:06:14 -04:00
arkon
19e37454c6
Make text clickable when removing item from tracker
...
(cherry picked from commit 8626a55fe4ee2fa5f61e6d4a2a8e0c7e3752cd25)
2023-10-29 10:41:00 -04:00
Vlasov Roman
2ba5460096
Change Shikimori domain from ".me" to ".one" ( #10027 )
...
(cherry picked from commit 8f3681d79f1624a092e5c356c9459897f4220c29)
2023-10-29 10:40:12 -04:00
arkon
0614a9a0dd
Update background job preferences once settings are restored
...
Co-authored-by: Jays2Kings <Jays2Kings@users.noreply.github.com>
(cherry picked from commit c4ce3dd46fe3ebf9b33b256106b8690e5543ddb8)
2023-10-29 10:39:27 -04:00
arkon
ff4c11bab0
Change crash log info to just have actual WebView version
...
(cherry picked from commit 22df12a680174890fe8f3559218b1819e37bf2f6)
2023-10-29 10:39:20 -04:00
arkon
07f34281c7
Show an error if backup file URI isn't returned to app when attempting restore
...
Related to #10028
(cherry picked from commit e572abb041cc0c410842fda1ed703f1b80a94d96)
2023-10-29 10:39:09 -04:00
Ivan Iskandar
ab04d07b3f
ExtensionLoader: Fix incorrect ext file deletion ( #10026 )
...
Ref c492efcb31775a65464cf68b4a249bc5bb8e6016
(cherry picked from commit ea99d77fda239c54d029223150f20cd69f9665c3)
2023-10-29 10:38:58 -04:00
arkon
54caea4daa
Minor cleanup
...
(cherry picked from commit 82a9d36df7c8a22c7dbd7762ecc38dbdacd2626e)
# Conflicts:
# .github/renovate.json5
# app/.gitignore
2023-10-29 10:38:15 -04:00
Caleb Morris
80844883ee
[dev QoL] Added AndroidStudio previews for [presentation.history] namespace ( #10012 )
...
* Added display preview for HistoryDialogs
* Added preview with provider for each branch for HistoryItem
* Added previews for HistoryScreen
Created in-memory preferences construct for when its needed at top-level injection
* Fixed ktlint violations
(cherry picked from commit 447bcb28efa890ea1ebd73183b9ae25e8150be39)
2023-10-29 10:37:16 -04:00
arkon
3842056d9c
Migrate top reader app bar to Compose
...
(cherry picked from commit d18022c25990f1961fef77eabb3924c68f283250)
# Conflicts:
# 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/widget/listener/SimpleAnimationListener.kt
# app/src/main/res/anim/enter_from_top.xml
# app/src/main/res/anim/exit_to_top.xml
# app/src/main/res/layout/reader_activity.xml
# app/src/main/res/menu/reader.xml
2023-10-29 00:06:12 -04:00
arkon
868a27110a
Remove remaining usages of platform-provided strings
...
(cherry picked from commit 5619a4c0d995774a4ba4e4030f639a62a708b771)
2023-10-28 15:30:56 -04:00
Ivan Iskandar
70ac8ea629
MangaSummary: Refactor to not use SubcomposeLayout ( #10008 )
...
(cherry picked from commit 0026f96fadbe029e8419985e69fb63bd2fe16d7f)
2023-10-28 15:26:27 -04:00
Ivan Iskandar
fdc7deb985
ExtensionLoader: Set read-only to private extension files ( #10007 )
...
(cherry picked from commit c492efcb31775a65464cf68b4a249bc5bb8e6016)
2023-10-28 15:26:18 -04:00
arkon
0fa0384f3d
Tweak Cloudflare help message in WebView screen
...
Catches pages like what Shinigami is currently showing.
Also adjusts the banner to make it look more like part of the top AppBar so it
looks less like part of the webpage.
(cherry picked from commit c386d375dee2a846dd59395e6eda3a07311ed3d5)
2023-10-28 15:26:07 -04:00
arkon
f55f49b2c8
Use AppBar abstraction in more places
...
(cherry picked from commit 540fb1bb7c36fda0b6c070caacd8fb2a4176ddc0)
2023-10-28 15:25:12 -04:00
arkon
40b93cc26c
Minor cleanup
...
(cherry picked from commit 81448f5d01ba6c6fb69de10118519c1036c46965)
2023-10-28 15:25:00 -04:00