Merge pull request #33 from Irineu333/release/v0.1.2

[Release/v0.1.2] Prototype - Patch 2
NeoA11y · Apr 22, 2023 · 4855364 · 4855364
2 parents c5fd972 + a5183ca
commit 4855364
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.neo.speaktouch"
         minSdk 22
         targetSdk 33
-        versionCode 2
-        versionName "0.1.1"
+        versionCode 3
+        versionName "0.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/neo/speaktouch/intercepter/FocusInterceptor.kt b/app/src/main/java/com/neo/speaktouch/intercepter/FocusInterceptor.kt
@@ -7,7 +7,7 @@ import timber.log.Timber
 
 class FocusInterceptor : Interceptor {
 
-    override fun handler(event: AccessibilityEvent) {
+    override fun handle(event: AccessibilityEvent) {
 
         val node = NodeInfo.wrap(event.source ?: return)
 

diff --git a/app/src/main/java/com/neo/speaktouch/intercepter/SpeechInterceptor.kt b/app/src/main/java/com/neo/speaktouch/intercepter/SpeechInterceptor.kt
@@ -14,7 +14,7 @@ class SpeechInterceptor(
     private val context: Context
 ) : Interceptor {
 
-    override fun handler(event: AccessibilityEvent) {
+    override fun handle(event: AccessibilityEvent) {
         if (event.eventType == AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED) {
             speak(NodeInfo.wrap(event.source ?: return))
         }
@@ -72,7 +72,7 @@ class SpeechInterceptor(
             for (index in 0 until node.childCount) {
                 val nodeChild = node.getChild(index)
 
-                if (nodeChild.isAvailableForAccessibility) {
+                if (nodeChild.isAvailableForAccessibility && !nodeChild.isRequiredFocus) {
                     add(getContent(nodeChild))
                 }
             }

diff --git a/app/src/main/java/com/neo/speaktouch/intercepter/interfece/Interceptor.kt b/app/src/main/java/com/neo/speaktouch/intercepter/interfece/Interceptor.kt
@@ -3,5 +3,5 @@ package com.neo.speaktouch.intercepter.interfece
 import android.view.accessibility.AccessibilityEvent
 
 interface Interceptor {
-    fun handler(event: AccessibilityEvent)
+    fun handle(event: AccessibilityEvent)
 }
diff --git a/app/src/main/java/com/neo/speaktouch/service/SpeakTouchService.kt b/app/src/main/java/com/neo/speaktouch/service/SpeakTouchService.kt
@@ -24,7 +24,7 @@ class SpeakTouchService : AccessibilityService() {
 
         Timber.d(event.getLog())
 
-        interceptors.forEach { it.handler(event) }
+        interceptors.forEach { it.handle(event) }
     }
 
     override fun onDestroy() {

diff --git a/app/src/main/java/com/neo/speaktouch/utils/extensions/AccessibilityNodeInfo.kt b/app/src/main/java/com/neo/speaktouch/utils/extensions/AccessibilityNodeInfo.kt
@@ -9,7 +9,7 @@ val NodeInfo.hasAnyClick: Boolean
     get() = isClickable || isLongClickable
 
 val NodeInfo.isReadable: Boolean
-    get() = !isIgnore && hasText
+    get() = !isIgnore && (hasText || isCheckable)
 
 val NodeInfo.hasText: Boolean
     get() = !contentDescription.isNullOrEmpty() ||