Refactor flags

Author: mickael-menu

readium/navigator/src/main/java/org/readium/r2/navigator/R2BasicWebView.kt

@@ -35,7 +35,7 @@ import org.json.JSONObject
 import org.jsoup.Jsoup
 import org.jsoup.safety.Safelist
 import org.readium.r2.navigator.extensions.optRectF
-import org.readium.r2.navigator.input.InputModifiers
+import org.readium.r2.navigator.input.InputModifier
 import org.readium.r2.navigator.input.Key
 import org.readium.r2.navigator.input.KeyEvent
 import org.readium.r2.shared.InternalReadiumApi
@@ -457,7 +457,7 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte
                 else -> return false
             },
             key = Key(jsonObject.optString("code")),
-            modifiers = InputModifiers(jsonObject)
+            modifiers = inputModifiers(jsonObject)
         )
 
         return listener?.onKey(event) ?: false
@@ -693,19 +693,18 @@ open class R2BasicWebView(context: Context, attrs: AttributeSet) : WebView(conte
     }
 }
 
-private operator fun InputModifiers.Companion.invoke(json: JSONObject): InputModifiers {
-    var modifiers = None
-    if (json.optBoolean("alt")) {
-        modifiers += Alt
-    }
-    if (json.optBoolean("control")) {
-        modifiers += Control
-    }
-    if (json.optBoolean("shift")) {
-        modifiers += Shift
-    }
-    if (json.optBoolean("meta")) {
-        modifiers += Meta
+private fun inputModifiers(json: JSONObject): Set<InputModifier> =
+    buildSet {
+        if (json.optBoolean("alt")) {
+            add(InputModifier.Alt)
+        }
+        if (json.optBoolean("control")) {
+            add(InputModifier.Control)
+        }
+        if (json.optBoolean("shift")) {
+            add(InputModifier.Shift)
+        }
+        if (json.optBoolean("meta")) {
+            add(InputModifier.Meta)
+        }
     }
-    return modifiers
-}

readium/navigator/src/main/java/org/readium/r2/navigator/input/InputModifiers.kt

@@ -1,22 +1,8 @@
 package org.readium.r2.navigator.input
 
 /**
- * Represents a set of modifiers for an input event.
+ * Represents a key modifier for an input event.
  */
-@JvmInline
-value class InputModifiers(val value: Int) {
-
-    companion object {
-        val None = InputModifiers(0)
-        val Alt = InputModifiers(1 shl 0)
-        val Control = InputModifiers(1 shl 1)
-        val Meta = InputModifiers(1 shl 2)
-        val Shift = InputModifiers(1 shl 3)
-    }
-
-    fun contains(other: InputModifiers): Boolean =
-        (value and other.value) == other.value
-
-    operator fun plus(other: InputModifiers): InputModifiers =
-        InputModifiers(value or other.value)
+enum class InputModifier {
+    Alt, Control, Meta, Shift
 }

readium/navigator/src/main/java/org/readium/r2/navigator/input/KeyEvent.kt

@@ -12,7 +12,7 @@ import android.view.KeyEvent as AndroidKeyEvent
 data class KeyEvent(
     val type: Type,
     val key: Key,
-    val modifiers: InputModifiers
+    val modifiers: Set<InputModifier> = emptySet()
 ) {
 
     enum class Type {
@@ -24,7 +24,7 @@ data class KeyEvent(
             return KeyEvent(
                 type = type,
                 key = Key(event) ?: return null,
-                modifiers = InputModifiers(event)
+                modifiers = inputModifiers(event)
             )
         }
     }
@@ -346,19 +346,18 @@ value class Key(val code: String) {
     }
 }
 
-private operator fun InputModifiers.Companion.invoke(event: android.view.KeyEvent): InputModifiers {
-    var modifiers = None
-    if (event.isAltPressed) {
-        modifiers += Alt
-    }
-    if (event.isCtrlPressed) {
-        modifiers += Control
-    }
-    if (event.isMetaPressed) {
-        modifiers += Meta
-    }
-    if (event.isShiftPressed) {
-        modifiers += Shift
+private fun inputModifiers(event: android.view.KeyEvent): Set<InputModifier> =
+    buildSet {
+        if (event.isAltPressed) {
+            add(InputModifier.Alt)
+        }
+        if (event.isCtrlPressed) {
+            add(InputModifier.Control)
+        }
+        if (event.isMetaPressed) {
+            add(InputModifier.Meta)
+        }
+        if (event.isShiftPressed) {
+            add(InputModifier.Shift)
+        }
     }
-    return modifiers
-}

readium/navigator/src/main/java/org/readium/r2/navigator/util/DirectionalNavigationAdapter.kt

@@ -4,7 +4,6 @@ import org.readium.r2.navigator.VisualNavigator
 import org.readium.r2.navigator.goLeft
 import org.readium.r2.navigator.goRight
 import org.readium.r2.navigator.input.InputListener
-import org.readium.r2.navigator.input.InputModifiers
 import org.readium.r2.navigator.input.Key
 import org.readium.r2.navigator.input.KeyEvent
 import org.readium.r2.navigator.input.TapEvent
@@ -34,7 +33,7 @@ import org.readium.r2.shared.ExperimentalReadiumApi
  */
 @ExperimentalReadiumApi
 class DirectionalNavigationAdapter(
-    private val tapEdges: TapEdges = TapEdges.Horizontal,
+    private val tapEdges: Set<TapEdge> = setOf(TapEdge.Horizontal),
     private val handleTapsWhileScrolling: Boolean = false,
     private val minimumHorizontalEdgeSize: Double = 80.0,
     private val horizontalEdgeThresholdPercent: Double? = 0.3,
@@ -46,38 +45,16 @@ class DirectionalNavigationAdapter(
     /**
      * Indicates which viewport edges trigger page turns on tap.
      */
-    @JvmInline
-    value class TapEdges(val value: Int) {
-        companion object {
-            /** The user cannot turn pages by tapping on the edges. */
-            val None = TapEdges(0)
-
-            /** The user can turn pages when tapping on the left and right edges. */
-            val Horizontal = TapEdges(1 shl 0)
-
-            /** The user can turn pages when tapping on the top and bottom edges. */
-            val Vertical = TapEdges(1 shl 1)
-
-            /**
-             * The user can turn pages when tapping on the edges of both the horizontal and vertical
-             * axes.
-             */
-            val All = TapEdges(Horizontal.value or Vertical.value)
-        }
-
-        fun contains(other: TapEdges): Boolean =
-            (value and other.value) == other.value
-
-        operator fun plus(other: TapEdges): TapEdges =
-            TapEdges(value or other.value)
+    enum class TapEdge {
+        Horizontal, Vertical;
     }
 
     override fun onTap(navigator: VisualNavigator, event: TapEvent): Boolean {
         if (navigator.presentation.value.scroll && !handleTapsWhileScrolling) {
             return false
         }
 
-        if (tapEdges.contains(TapEdges.Horizontal)) {
+        if (tapEdges.contains(TapEdge.Horizontal)) {
             val width = navigator.publicationView.width.toDouble()
 
             val horizontalEdgeSize = horizontalEdgeThresholdPercent?.let {
@@ -93,7 +70,7 @@ class DirectionalNavigationAdapter(
             }
         }
 
-        if (tapEdges.contains(TapEdges.Vertical)) {
+        if (tapEdges.contains(TapEdge.Vertical)) {
             val height = navigator.publicationView.height.toDouble()
 
             val verticalEdgeSize = verticalEdgeThresholdPercent?.let {
@@ -113,7 +90,7 @@ class DirectionalNavigationAdapter(
     }
 
     override fun onKey(navigator: VisualNavigator, event: KeyEvent): Boolean {
-        if (event.type != KeyEvent.Type.Down || event.modifiers != InputModifiers.None) {
+        if (event.type != KeyEvent.Type.Down || !event.modifiers.isEmpty()) {
             return false
         }