This repository was archived by the owner on Jul 29, 2022. It is now read-only.
MIgrate to ViewPager2 #157
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ import org.readium.r2.shared.publication.ReadingProgression | |
| open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(context, attrs) { | ||
|
|
||
| lateinit var listener: Listener | ||
| lateinit var navigator: VisualNavigator | ||
|
|
||
| var progression: Double = 0.0 | ||
| var overrideUrlLoading = true | ||
|
|
@@ -75,18 +75,18 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte | |
| listener.onScroll() | ||
|
|
||
| if (scrollMode) { | ||
| if (navigator.readingProgression == ReadingProgression.RTL) { | ||
| [email protected]("scrollRightRTL();") { result -> | ||
| if (result.contains("edge")) { | ||
| navigator.goBackward(animated = animated) | ||
| } | ||
| } | ||
| } else { | ||
| navigator.goForward(animated = animated) | ||
| } | ||
| } else { | ||
| if ([email protected](1)) { | ||
| navigator.goRight(animated = animated) | ||
| } | ||
| [email protected]("scrollRight();", null) | ||
| } | ||
|
|
@@ -99,20 +99,24 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte | |
| listener.onScroll() | ||
|
|
||
| if (scrollMode) { | ||
| if (navigator.readingProgression == ReadingProgression.RTL) { | ||
| [email protected]("scrollLeftRTL();") { result -> | ||
| if (result.contains("edge")) { | ||
| navigator.goForward(animated = animated) | ||
| } | ||
| } | ||
| } else { | ||
| navigator.goBackward(animated = animated) | ||
| } | ||
| } else { | ||
| if ([email protected](-1)) { | ||
| navigator.goLeft(animated = animated) | ||
| } | ||
| // This is a temporary fix to prevent the webview from snapping to the beginning | ||
| // of the resource when paging between them in RTL layouts | ||
| if (navigator.readingProgression == ReadingProgression.LTR) { | ||
| [email protected]("scrollLeft();", null) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -217,7 +221,7 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte | |
| } | ||
|
|
||
| fun scrollToPosition(progression: Double) { | ||
| this.evaluateJavascript("scrollToPosition(\"$progression\", \"${navigator.readingProgression.value}\");", null) | ||
| } | ||
|
|
||
| fun setScrollMode(scrollMode: Boolean) { | ||
|
|
@@ -283,7 +287,6 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte | |
| } | ||
|
|
||
| interface Listener { | ||
| fun onPageLoaded() | ||
| fun onPageChanged(pageIndex: Int, totalPages: Int, url: String) | ||
| fun onPageEnded(end: Boolean) | ||
|
|
@@ -292,7 +295,5 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte | |
| fun onProgressionChanged(progression: Double) | ||
| fun onHighlightActivated(id: String) | ||
| fun onHighlightAnnotationMarkActivated(id: String) | ||
| } | ||
| } | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import androidx.fragment.app.FragmentActivity | |
| import androidx.lifecycle.LiveData | ||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.viewpager.widget.ViewPager | ||
| import androidx.viewpager2.widget.ViewPager2 | ||
| import kotlinx.coroutines.* | ||
| import org.readium.r2.navigator.* | ||
| import org.readium.r2.navigator.R | ||
|
|
@@ -47,7 +48,7 @@ class EpubNavigatorFragment( | |
|
|
||
|
|
||
| internal lateinit var positions: List<Locator> | ||
| lateinit var resourcePager: ViewPager2 | ||
|
|
||
| private lateinit var resourcesSingle: ArrayList<Pair<Int, String>> | ||
| private lateinit var resourcesDouble: ArrayList<Triple<Int, String, String>> | ||
|
|
@@ -70,7 +71,6 @@ class EpubNavigatorFragment( | |
| preferences = requireContext().getSharedPreferences("org.readium.r2.settings", Context.MODE_PRIVATE) | ||
|
|
||
| resourcePager = view.findViewById(R.id.resourcePager) | ||
|
|
||
| resourcesSingle = ArrayList() | ||
| resourcesDouble = ArrayList() | ||
|
|
@@ -117,33 +117,33 @@ class EpubNavigatorFragment( | |
|
|
||
|
|
||
| if (publication.metadata.presentation.layout == EpubLayout.REFLOWABLE) { | ||
| resourcePager.isUserInputEnabled = false | ||
|
There was a problem hiding this comment. @stevenzeck Why did you need to switch off There was a problem hiding this comment. This is the equivalent of There was a problem hiding this comment. Okay, I guess this is the reason FXL EPUB can't be interacted with. Since they are not paginated, maybe this can be done selectively only for reflowable. However I wonder why links are working in reflowable EPUBs despite |
||
| adapter = R2PagerAdapter(supportFragmentManager, lifecycle, resourcesSingle, publication.metadata.title, Publication.TYPE.EPUB) | ||
| } else { | ||
| adapter = when (preferences.getInt(COLUMN_COUNT_REF, 0)) { | ||
| 1 -> { | ||
| R2PagerAdapter(supportFragmentManager, lifecycle, resourcesSingle, publication.metadata.title, Publication.TYPE.FXL) | ||
| } | ||
| 2 -> { | ||
| R2PagerAdapter(supportFragmentManager, lifecycle, resourcesDouble, publication.metadata.title, Publication.TYPE.FXL) | ||
| } | ||
| else -> { | ||
| // TODO based on device | ||
| // TODO decide if 1 page or 2 page | ||
| R2PagerAdapter(supportFragmentManager, lifecycle, resourcesSingle, publication.metadata.title, Publication.TYPE.FXL) | ||
| } | ||
| } | ||
| } | ||
| resourcePager.adapter = adapter | ||
|
|
||
| // resourcePager.direction = publication.contentLayout.readingProgression | ||
| resourcePager.layoutDirection = View.LAYOUT_DIRECTION_LTR | ||
|
|
||
| if (publication.cssStyle == ReadingProgression.RTL.value) { | ||
| resourcePager.layoutDirection = View.LAYOUT_DIRECTION_RTL | ||
| } | ||
|
Comment on lines
+139
to
144
There was a problem hiding this comment.
resourcePager.layoutDirection = when (publication.contentLayout.readingProgression) {
ReadingProgression.RTL -> View.Layout_DIRECTION_RTL
else -> View.Layout_DIRECTION_LTR
}I'm not yet sure if TTB and BTT will need to be handled differently with the ViewPager2. But it's not used yet anyway. There was a problem hiding this comment. Yeah, I was wondering what TTB and BTT are exactly and how they would factor into this. Will make the change you suggested. There was a problem hiding this comment. It's for vertical reading progression: top-to-bottom and bottom-to-top. I wonder if we could not handle them with https://developer.android.com/reference/kotlin/androidx/viewpager2/widget/ViewPager2#setorientation And then combining it with |
||
|
|
||
| resourcePager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { | ||
|
|
||
| override fun onPageSelected(position: Int) { | ||
| // if (publication.metadata.presentation.layout == EpubLayout.REFLOWABLE) { | ||
|
|
@@ -317,11 +317,11 @@ class EpubNavigatorFragment( | |
|
|
||
| override fun goForward(animated: Boolean, completion: () -> Unit): Boolean { | ||
| launch { | ||
| if (resourcePager.currentItem < resourcePager.adapter!!.itemCount - 1) { | ||
|
|
||
| resourcePager.setCurrentItem(resourcePager.currentItem + 1, animated) | ||
|
|
||
| if (publication.contentLayout.readingProgression == ReadingProgression.RTL) { | ||
| // The view has RTL layout | ||
| currentFragment?.webView?.apply { | ||
| progression = 1.0 | ||
|
|
@@ -345,7 +345,7 @@ class EpubNavigatorFragment( | |
|
|
||
| resourcePager.setCurrentItem(resourcePager.currentItem - 1, animated) | ||
|
|
||
| if (publication.contentLayout.readingProgression == ReadingProgression.RTL) { | ||
| // The view has RTL layout | ||
| currentFragment?.webView?.apply { | ||
| progression = 0.0 | ||
|
|
@@ -363,11 +363,12 @@ class EpubNavigatorFragment( | |
| return true | ||
| } | ||
|
|
||
| // FIXME this isn't used | ||
| private val r2PagerAdapter: R2PagerAdapter | ||
| get() = resourcePager.adapter as R2PagerAdapter | ||
|
|
||
| val currentFragment: R2EpubPageFragment? get() = | ||
|
There was a problem hiding this comment. @stevenzeck Could you set |
||
| adapter.fm.findFragmentByTag("f${resourcePager.currentItem}") as? R2EpubPageFragment | ||
|
|
||
| override val readingProgression: ReadingProgression | ||
| get() = publication.contentLayout.readingProgression | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -136,39 +136,36 @@ class R2EpubPageFragment : Fragment() { | |
| super.onPageFinished(view, url) | ||
|
|
||
| val epubNavigator = (webView.navigator as? EpubNavigatorFragment) | ||
|
|
||
| var locations = epubNavigator?.pendingLocator?.locations | ||
| epubNavigator?.pendingLocator = null | ||
|
|
||
| // TODO this seems to be needed, will need to test more | ||
| if (url!!.indexOf("#") > 0) { | ||
| val id = url.substring(url.indexOf('#')) | ||
| webView.loadUrl("javascript:scrollAnchor($id);") | ||
| locations = Locator.Locations(fragments = listOf(id)) | ||
| } | ||
|
|
||
| if (locations != null && locations.fragments.isEmpty()) { | ||
| locations.progression?.let { progression -> | ||
| [email protected] = progression | ||
|
|
||
| if (webView.scrollMode) { | ||
| [email protected](progression) | ||
| } else { | ||
| // FIXME: We need a better way to wait, because if the value is too low it fails | ||
| (object : CountDownTimer(200, 1) { | ||
| override fun onTick(millisUntilFinished: Long) {} | ||
| override fun onFinish() { | ||
| [email protected]() | ||
| [email protected]([email protected], false) | ||
| } | ||
| }).start() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| webView.listener.onPageLoaded() | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stevenzeck What did you mean by temporary? Do you have any idea on how to fix this in a more permanent way?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was temporary in that I was hoping there was a different problem, but I couldn't find one. I'll remove that part of the comment.