Merge pull request #76 from readium/fixes/touch-interception

fixed touch events, no disabling needed anymore
readium · Jun 18, 2019 · dff1ca1 · dff1ca1
2 parents ad7df1a + c7bf90d
commit dff1ca1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 304 deletions.
diff --git a/r2-navigator/src/main/java/org/readium/r2/navigator/R2EpubActivity.kt b/r2-navigator/src/main/java/org/readium/r2/navigator/R2EpubActivity.kt
@@ -76,7 +76,7 @@ open class R2EpubActivity : AppCompatActivity(), PageCallback, CoroutineScope {
         // TODO needs work, currently showing two resources for fxl, needs to understand which two resources, left & right, or only right etc.
         var doublePageIndex = 0
         var doublePageLeft = ""
-        var doublePageRight: String = ""
+        var doublePageRight = ""
         var resourceIndexDouble = 0
 
         for ((resourceIndexSingle, spineItem) in publication.readingOrder.withIndex()) {
@@ -161,7 +161,7 @@ open class R2EpubActivity : AppCompatActivity(), PageCallback, CoroutineScope {
 
             override fun onPageSelected(position: Int) {
                 if (publication.metadata.rendition.layout == RenditionLayout.Reflowable) {
-                    resourcePager.disableTouchEvents = true
+//                    resourcePager.disableTouchEvents = true
                 }
                 pagerPosition = 0
                 val currentFragment = ((resourcePager.adapter as R2PagerAdapter).mFragments.get((resourcePager.adapter as R2PagerAdapter).getItemId(resourcePager.currentItem))) as? R2EpubPageFragment

diff --git a/r2-navigator/src/main/java/org/readium/r2/navigator/pager/R2ViewPager.kt b/r2-navigator/src/main/java/org/readium/r2/navigator/pager/R2ViewPager.kt
@@ -11,7 +11,6 @@ package org.readium.r2.navigator.pager
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.MotionEvent
 
 class R2ViewPager : R2RTLViewPager {
 
@@ -26,16 +25,5 @@ class R2ViewPager : R2RTLViewPager {
     override fun setCurrentItem(item: Int) {
         super.setCurrentItem(item, false)
     }
-
-
-    var disableTouchEvents: Boolean = false
-
-    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        return if (disableTouchEvents) false else super.onInterceptTouchEvent(event)
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        return if (disableTouchEvents) false else super.onTouchEvent(event)
-    }
-
+
 }