Co-Authored-By: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Co-authored-by: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
(cherry picked from commit 5bb78eb77f2f68c40079548d5fe3b75a11f2bf71)
# Conflicts:
# app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaLastUpdatedPutResolver.kt
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
Fixing some things that were errors when compiling against SDK 33.
(cherry picked from commit cf48bbc176a164bf49a9dd3a0ccd3fe7cf4c6f2e)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
Pulling out some of the smaller changes that aren't related to the manga controller changes in #7244
(cherry picked from commit 7fdbf40cd23132915bd90cf623e4a69fb560dd26)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSettingsSheet.kt
Ascending by date = oldest dates first. If no date is present, fallback to epoch 0 (i.e., oldest).
(cherry picked from commit 7773deabc03eb106798aed113341acf66a5f6a77)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
Use ConstraintLayout for ez size ratio calculation and merge cover-only view
holder with compact's
(cherry picked from commit fad1449de34952e12e2c5464dccf500d49fa7fa1)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryComfortableGridHolder.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCompactGridHolder.kt
# app/src/main/res/layout/source_comfortable_grid_item.xml
# app/src/main/res/layout/source_compact_grid_item.xml
* No title grid added to library and source
* Else added to display title in case image is null or empty
* No title grid renamed and now only available in library
* Spanish strings about cover only grid removed
Co-authored-by: micaelagimenez <micaela.gimenez@ext.prosegur.com>
(cherry picked from commit 44b055c01986b6b4952ab4658e04cf236f922fa0)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/setting/DisplayModeSetting.kt
* Reduce notifyDataSetChanged calls when category count is disabled
* Fix category tabs briefly showing when it's supposed to be disabled
Also fix tabs showing when activity recreated
* Lift appbar when tab is hidden
Check against tab visibility instead of viewpager
* Restore selected nav item after recreate
* Simplify SHORTCUT_MANGA intent handling
Don't need to change controller if the topmost controller is the target
(cherry picked from commit 2932ed670f5760eba28aea80f1dd29e7a9af48c7)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
To be exposed in extension-lib 1.3
(cherry picked from commit 375a27a93d76292a47310e9544c895f517af35f9)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
The remaining ones could also be converted to FlowPreferences for this, but it's not really necessary.
(cherry picked from commit f3718257f50e595dbbf04c8d2e90a21fb4d80c09)
# Conflicts:
# 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/extension/ExtensionPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt
* Pair ActionToolbar with ActionMode
This makes ActionToolbar an activity object that can be configured in the
similar way as ActionMode
* Remove action toolbar workaround now that it stays in activity layout
5924
* Set status bar color when action mode is active
6256
* Adjust fab show timing after action mode finished
* Adjust action toolbar layout and animation
Default corner size and use bottom sheet animation
6069
* Adjust action toolbar layout on large screen
Right half of the screen
(cherry picked from commit 2ed01af72381c3abc8692af22bc528c93f24d530)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
Since apparently people don't read and either option is considered destructive to different people.
(cherry picked from commit cd87c7e88efafd5800b563d51c2ede4a84ad5e4b)
Reverts inset change from #5997, was changed due to it not changing the padding when using setPadding
(cherry picked from commit b4490e209ba74e657c192dddc983b17e8bc3217a)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
* Implemented language badge on library items
* Added left margin for better viewing the badge on list view
* Adjusting borders on badges, cleaning string interpolation and cleaning code
* Improving readability on Holders and removing unused background and text on grid items
(cherry picked from commit 918502742d9cd26ac70b0db067bfae02bb4c4e88)
* Remove padding when using list with Per Category setting (fixes#5636)
* Add view type to RecyclerViewPagerAdapter
Correctly this time (ﾉ◕ヮ◕)ﾉ*:･ﾟ✧
* Minor tweaks
(cherry picked from commit 372e5005903d12f131088df04d50799e88ba2de4)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
* Change how the bottom navigation is hidden
Modifies the translationY instead of the height.
* Cleanups
(cherry picked from commit f125ab01ee07d7144f93e1c67cfcf425f0df5779)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
