Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from mihon until latest commit #1804

Merged
merged 197 commits into from
Nov 4, 2024
Merged

Merge from mihon until latest commit #1804

merged 197 commits into from
Nov 4, 2024

Conversation

Secozzi
Copy link
Contributor

@Secozzi Secozzi commented Oct 31, 2024

Last commit merged: mihonapp/mihon@f33a6d2

renovate bot and others added 30 commits September 18, 2024 08:38
…a09 (#1039)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit ca784cbe3267e94e652e4c54f91b7107cc53c307)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….9.1 (#1042)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit e48dbdbf2356c0e6e148313dc6610e865cd8e995)
…#1043)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 602b58f364b95b83a3148be34cd4c90d95d7d405)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit b7849d714698900a25188bdbfd77bf24936f2dd7)
* Fixes #1029

* Max Line Length Fix

* Update SettingsLibraryScreen.kt

No idea how this works.

Co-authored-by: Foolbar <[email protected]>

---------

Co-authored-by: Foolbar <[email protected]>
Co-authored-by: Roshan Varughese <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 41e2dc7ae80250d9166fc637c1170667afdb0a9e)
…024.07.00-alpha02 (#1051)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 04aa5b36a5893ef9991312d61f84f830b83535f7)
* Don't use animateItem's fade-in/fade-out in FastScrollLazyColumn

* Move to extension function

Avoid using animateItemPlacement name since it's shadowed by compose-bom's deprecated one

Co-authored-by: Cuong-Tran <[email protected]>
* Add Copy to Clipboard

* Removing Unused Import

* Reusing onShare function

* Commit Suggestion

* Early Return on null

Co-authored-by: AntsyLich <[email protected]>

---------

Co-authored-by: AntsyLich <[email protected]>
Co-authored-by: Roshan Varughese <[email protected]>
(cherry picked from commit 8160b47ff5fbbd9b32caeb462b5be881fabd3449)
* Improve error message if restoring from JSON file

* Replace Exception with IOException

* Use more generic error message if protobuf fails

* fix lint

Co-authored-by: Vetle Ledaal <[email protected]>
And increase recycler item view cache size.

(cherry picked from commit a3dfd2efe6ace7a2a4d79bd09fb1a729989f1094)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 3f6bd5f010532d292310c0c0f14bf11832277f2e)
(cherry picked from commit 854474f85ffc41eccdc2b3a6cf105fa2805ebc3c)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit edb8201f74e516c296b62e04a13802e1bd9e0b6b)
* Backup/Restore Extension Repos

* Refactor

* Moving to Under App Settings

* Sort by URL, Check existing by SHA and Error Logging

Untested. Currently in a lecture and can't test if the changes really work.

* Changes to logic

* Don't ask me what's happening here

* Renaming Variables

* Fixing restoreAmount & changes to logic

Co-Authored-By: AntsyLich <[email protected]>

---------

Co-authored-by: AntsyLich <[email protected]>
Co-authored-by: Roshan Varughese <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 8e40146f96704c3dc98bbb4f9f89d470ffa32f69)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#1090)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 36b9caeea8baf15f0d0ed37abc12638d44194c09)
)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit af77083660000e7378587dbc8d44e44bd8b196ec)
…a10 (#1092)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit e8b7c3e24bb677d289554b972ef2496a976c79aa)
…024.08.00-alpha01 (#1094)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit dca9bf105770890e015b8e2f9fbf22f05665e343)
…#1099)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
(cherry picked from commit 4828c54245dd6532c0e7a2b6c8cf5d8a703d3376)
renovate-bot and others added 27 commits October 31, 2024 11:26
(cherry picked from commit e1e3ca7a565503d325322fbbdbff01868f6f2bcb)
(cherry picked from commit 01b44c0458eb77f8d5347328be0c3ef25c906b1b)
(cherry picked from commit d4bf19f957cf32671b7306076ac5bd5c94732d8b)
Co-authored-by: AntsyLich <[email protected]>
(cherry picked from commit 47b0e9d7bec5ab0c7d16a3c70999eaac8636f633)
Co-authored-by: Roshan Varughese <[email protected]>
(cherry picked from commit 2ba7ed32802ffca1946d567b8afe49bfd3f4326e)
…1378)

(cherry picked from commit aae0e3459ce13398a64b5cd9995f4a40a0120822)
(cherry picked from commit df9fff60da3a38acd8fcd540b5fdd275be93f2d5)
(cherry picked from commit 2bf7ef5d18f839e31c501f4e6e1abff9fa7f74d6)
Fixes some build issues

(cherry picked from commit 264030d6ecbc7492d884eb328b74399cd722dcb0)
Somehow this specific issue keeps getting flagged by unrelated PRs'
CI runs (but only sometimes? Somehow? Other times the CI run would
succeed with no spotless issues.)

---------

Co-authored-by: MajorTanya <[email protected]>
Co-authored-by: AntsyLich <[email protected]>
(cherry picked from commit b8b053b1d720a6de5c3d4d8a683eed7bc8cdcc5f)
(cherry picked from commit 9d6ddb5d91bd062876bdb108ca3ce278359551e5)
(cherry picked from commit eedece5adfbb95c882d4d59a5020f7e27c634c13)
Probably fix the anime side as well

In short:
- fetch & show actual summary
- fallback to "name" if "name_cn" is empty
- request larger responseGroup to get & display the summary & rating
- add type filter query param to make Bangumi filter, not us

Previously, we only displayed the "name" in the summary area and used
"name_cn" as the entry name. However, "name_cn" (Chinese name) can be
an empty string at times, resulting in an awkward looking search
result list where some, many, or even all the results have no title
displayed and only show the "name" (Japanese name) in the summary
area. This has been solved by using "name" as a fallback value should
"name_cn" be empty.

If a Chinese name is available, the original name is prepended to the
summary with the addition "作品原名:" (meaning "original series title").

By using the "responseGroup=large" query parameter, we can request
the required data we need to display the actual summary for an entry
and the entry's average rating.
The "name" is prepended to the summary contents, if any exist, so it
is still accessible for series identification if a "name_cn" exists
too and was used for the result title.

Adding the "type=1" filter query parameter means Bangumi will only
return entries of type 1 ("book") instead of all types and Mihon
needing to filter, resulting in potentially missed entry matches.

Co-authored-by: MajorTanya <[email protected]>
(cherry picked from commit 328ec8c752f276a6e75f68102a257880e4b18753)
#1416)

(cherry picked from commit 2914d166fe0ad5d6bb126fd5fe89d8ca3074787b)
(cherry picked from commit 41ae8505fecd08c77bf316172e29698dd12b4023)
(cherry picked from commit f33a6d25209fa9a1291f3dae222fc0ff8d95dba9)
@jmir1 jmir1 merged commit 1b31fca into master Nov 4, 2024
1 check passed
@jmir1 jmir1 deleted the mihonmerge branch November 4, 2024 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.