Deprecate Link.toLocator() in favor of Publication.locatorFromLink()
#83
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mickael-menu
commented
Jan 21, 2022
| override val currentLocator: StateFlow<Locator> get() = _currentLocator | ||
| private val _currentLocator = MutableStateFlow(initialLocator ?: publication.readingOrder.first().toLocator()) | ||
| private val _currentLocator = MutableStateFlow(initialLocator | ||
| ?: requireNotNull(publication.locatorFromLink(publication.readingOrder.first())) |
Member
Author
There was a problem hiding this comment.
A link in the reading order must have a type, so locatorFromLink() will not return null.
mickael-menu
commented
Jan 21, 2022
| * If there's no match, try again after removing any query parameter and anchor from the | ||
| * given [href]. | ||
| */ | ||
| fun linkWithHref(href: String): Link? { |
Member
Author
There was a problem hiding this comment.
I moved this from Publication, as it makes sense to have it in Manifest as well.
mickael-menu
commented
Jan 21, 2022
Comment on lines
-87
to
-91
| // progression is mandatory in some contexts | ||
| if (it.locations.fragments.isEmpty()) | ||
| it.copyWithLocations(progression = 0.0) | ||
| else | ||
| it |
Member
Author
There was a problem hiding this comment.
I made sure that locatorFromLink() returns a Locator with either progression or fragments set.
qnga
requested changes
Jan 24, 2022
readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt
Show resolved
Hide resolved
mickael-menu
force-pushed
the
fix/link-to-locator
branch
from
3c212c0 to
46327bf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Deprecated
Shared
Link.toLocator()is deprecated as it may create an incorrectLocatorif the linktypeis missing.publication.locatorFromLink()instead.See Slack discussion for context: https://readium.slack.com/archives/C703MSTQU/p1642520174001200