Reduce priority of jcenter repository

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -41,6 +41,8 @@ object PreferenceKeys {
 
     const val readWithTapping = "reader_tap"
 
+    const val readWithLongTap = "reader_long_tap"
+
     const val readWithVolumeKeys = "reader_volume_keys"
 
     const val readWithVolumeKeysInverted = "reader_volume_keys_inverted"

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -69,6 +69,8 @@ class PreferencesHelper(val context: Context) {
 
     fun readWithTapping() = rxPrefs.getBoolean(Keys.readWithTapping, true)
 
+    fun readWithLongTap() = rxPrefs.getBoolean(Keys.readWithLongTap, true)
+
     fun readWithVolumeKeys() = rxPrefs.getBoolean(Keys.readWithVolumeKeys, false)
 
     fun readWithVolumeKeysInverted() = rxPrefs.getBoolean(Keys.readWithVolumeKeysInverted, false)

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt

@@ -62,6 +62,7 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : BottomSheetDia
         show_page_number.bindToPreference(preferences.showPageNumber())
         fullscreen.bindToPreference(preferences.fullscreen())
         keepscreen.bindToPreference(preferences.keepScreenOn())
+        long_tap.bindToPreference(preferences.readWithLongTap())
     }
 
     /**

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/Pager.kt

@@ -25,7 +25,7 @@ open class Pager(
     /**
      * Long tap listener function to execute when a long tap is detected.
      */
-    var longTapListener: ((MotionEvent) -> Unit)? = null
+    var longTapListener: ((MotionEvent) -> Boolean)? = null
 
     /**
      * Gesture listener that implements tap and long tap events.
@@ -38,8 +38,7 @@ open class Pager(
 
         override fun onLongTapConfirmed(ev: MotionEvent) {
             val listener = longTapListener
-            if (listener != null) {
+            if (listener != null && listener.invoke(ev)) {
-                listener.invoke(ev)
                 performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
             }
         }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt

@@ -19,6 +19,9 @@ class PagerConfig(private val viewer: PagerViewer, preferences: PreferencesHelpe
     var tappingEnabled = true
         private set
 
+    var longTapEnabled = true
+        private set
+
     var volumeKeysEnabled = false
         private set
 
@@ -44,6 +47,9 @@ class PagerConfig(private val viewer: PagerViewer, preferences: PreferencesHelpe
         preferences.readWithTapping()
             .register({ tappingEnabled = it })
 
+        preferences.readWithLongTap()
+            .register({ longTapEnabled = it })
+
         preferences.pageTransitions()
             .register({ usePageTransitions = it })
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt

@@ -92,11 +92,15 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
                 else -> activity.toggleMenu()
             }
         }
-        pager.longTapListener = {
+        pager.longTapListener = f@ {
-            val item = adapter.items.getOrNull(pager.currentItem)
+            if (activity.menuVisible || config.longTapEnabled) {
-            if (item is ReaderPage) {
+                val item = adapter.items.getOrNull(pager.currentItem)
-                activity.onPageLongTap(item)
+                if (item is ReaderPage) {
+                    activity.onPageLongTap(item)
+                    return@f true
+                }
             }
+            false
         }
 
         config.imagePropertyChangedListener = {

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt

@@ -19,6 +19,9 @@ class WebtoonConfig(preferences: PreferencesHelper = Injekt.get()) {
     var tappingEnabled = true
         private set
 
+    var longTapEnabled = true
+        private set
+
     var volumeKeysEnabled = false
         private set
 
@@ -35,6 +38,9 @@ class WebtoonConfig(preferences: PreferencesHelper = Injekt.get()) {
         preferences.readWithTapping()
             .register({ tappingEnabled = it })
 
+        preferences.readWithLongTap()
+            .register({ longTapEnabled = it })
+
         preferences.cropBordersWebtoon()
             .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() })
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt

@@ -37,7 +37,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor(
     private val detector = Detector()
 
     var tapListener: ((MotionEvent) -> Unit)? = null
-    var longTapListener: ((MotionEvent) -> Unit)? = null
+    var longTapListener: ((MotionEvent) -> Boolean)? = null
 
     override fun onMeasure(widthSpec: Int, heightSpec: Int) {
         halfWidth = MeasureSpec.getSize(widthSpec) / 2
@@ -220,8 +220,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor(
 
         override fun onLongTapConfirmed(ev: MotionEvent) {
             val listener = longTapListener
-            if (listener != null) {
+            if (listener != null && listener.invoke(ev)) {
-                listener.invoke(ev)
                 performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
             }
         }

app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt

@@ -95,13 +95,17 @@ class WebtoonViewer(val activity: ReaderActivity) : BaseViewer {
                 else -> activity.toggleMenu()
             }
         }
-        recycler.longTapListener = { event ->
+        recycler.longTapListener = f@ { event ->
-            val child = recycler.findChildViewUnder(event.x, event.y)
+            if (activity.menuVisible || config.longTapEnabled) {
-            val position = recycler.getChildAdapterPosition(child)
+                val child = recycler.findChildViewUnder(event.x, event.y)
-            val item = adapter.items.getOrNull(position)
+                val position = recycler.getChildAdapterPosition(child)
-            if (item is ReaderPage) {
+                val item = adapter.items.getOrNull(position)
-                activity.onPageLongTap(item)
+                if (item is ReaderPage) {
+                    activity.onPageLongTap(item)
+                    return@f true
+                }
             }
+            false
         }
 
         frame.layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt

@@ -108,6 +108,11 @@ class SettingsReaderController : SettingsController() {
                 titleRes = R.string.pref_read_with_tapping
                 defaultValue = true
             }
+            switchPreference {
+                key = Keys.readWithLongTap
+                titleRes = R.string.pref_read_with_long_tap
+                defaultValue = true
+            }
             switchPreference {
                 key = Keys.readWithVolumeKeys
                 titleRes = R.string.pref_read_with_volume_keys

app/src/main/res/layout/reader_settings_sheet.xml

@@ -123,11 +123,20 @@
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintTop_toBottomOf="@id/fullscreen" />
 
+    <android.support.v7.widget.SwitchCompat
+        android:id="@+id/long_tap"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/pref_read_with_long_tap"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintTop_toBottomOf="@id/keepscreen" />
+
     <android.support.v4.widget.Space
         android:id="@+id/end_general_preferences"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="@id/keepscreen" />
+        app:layout_constraintBottom_toBottomOf="@id/long_tap" />
 
     <!-- Pager preferences -->
 

app/src/main/res/values/strings.xml

@@ -180,6 +180,7 @@
     <string name="pref_read_with_volume_keys">Volume keys</string>
     <string name="pref_read_with_volume_keys_inverted">Invert volume keys</string>
     <string name="pref_read_with_tapping">Tapping</string>
+    <string name="pref_read_with_long_tap">Long tap dialog</string>
     <string name="pref_reader_theme">Background color</string>
     <string name="white_background">White</string>
     <string name="black_background">Black</string>

build.gradle

@@ -19,9 +19,9 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         maven { url "https://jitpack.io" }
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        maven { url  "https://dl.bintray.com/inorichi/maven" }
+        jcenter()
+        maven { url "https://dl.bintray.com/inorichi/maven" }
     }
 }