Drag IME to switch between the 3 modes (#91)

Changes:

- IME: change UI mode by vertical dragging (instead of pressing the lower-right-corner button)
- IME: lower-right-corner button is now only a microphone button (but invisible in the default UI mode)
- IME: up/down swipe moves/selects faster
- improve UI of combo buttons (underline to indicate selection)
- update speechutils (avoids lint error about AUDIO_RECORD permission)

Author: Kaljurand

app/build.gradle

@@ -7,9 +7,9 @@ dependencies {
     implementation 'com.googlecode.json-simple:json-simple:1.1'
     implementation 'com.koushikdutta.async:androidasync:3.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     // implementation 'androidx.activity:activity:1.3.0-alpha03'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
     implementation 'com.google.android.material:material:1.3.0'
@@ -27,8 +27,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1800
-        versionName '1.8.00'
+        versionCode 1805
+        versionName '1.8.05'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs "en", "et"

app/src/main/java/ee/ioc/phon/android/speak/activity/PermissionsRequesterActivity.java

@@ -27,6 +27,7 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         switch (requestCode) {
             case PERMISSION_REQUEST_RECORD_AUDIO: {
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {

app/src/main/java/ee/ioc/phon/android/speak/adapter/ComboButtonsAdapter.kt

@@ -1,6 +1,7 @@
 package ee.ioc.phon.android.speak.adapter
 
 import android.content.ComponentName
+import android.graphics.Paint
 import android.os.Build
 import android.view.LayoutInflater
 import android.view.View
@@ -11,8 +12,11 @@ import ee.ioc.phon.android.speak.R
 import ee.ioc.phon.android.speak.ServiceLanguageChooser
 import ee.ioc.phon.android.speak.model.Combo
 
-class ComboButtonsAdapter(private val mListener: ComboButtonsAdapterListener, private val mSlc: ServiceLanguageChooser) : RecyclerView.Adapter<ComboButtonsAdapter.MyViewHolder>() {
-    private lateinit var mSelectedView: View
+class ComboButtonsAdapter(
+    private val mListener: ComboButtonsAdapterListener,
+    private val mSlc: ServiceLanguageChooser
+) : RecyclerView.Adapter<ComboButtonsAdapter.MyViewHolder>() {
+    private lateinit var mSelectedView: Button
 
     interface ComboButtonsAdapterListener {
         fun onComboChange(language: String, service: ComponentName)
@@ -22,8 +26,10 @@ class ComboButtonsAdapter(private val mListener: ComboButtonsAdapterListener, pr
     class MyViewHolder(var mView: Button) : RecyclerView.ViewHolder(mView)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder {
-        return MyViewHolder(LayoutInflater.from(parent.context)
-                .inflate(R.layout.list_item_combo_button, parent, false) as Button)
+        return MyViewHolder(
+            LayoutInflater.from(parent.context)
+                .inflate(R.layout.list_item_combo_button, parent, false) as Button
+        )
     }
 
     override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
@@ -38,9 +44,13 @@ class ComboButtonsAdapter(private val mListener: ComboButtonsAdapterListener, pr
             val combo = Combo(context, mSlc[position])
             if (mSlc.isSelected(position)) {
                 mSelectedView = holder.mView
-                holder.mView.alpha = 1f
+                mSelectedView.alpha = 1f
+                mSelectedView.paintFlags = mSelectedView.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                mSelectedView.isClickable = false
             } else {
                 holder.mView.alpha = 0.5f
+                holder.mView.paintFlags = 0
+                holder.mView.isClickable = true
             }
             var label = combo.localeAsStr
             if (label.isEmpty() || label.equals("und")) {
@@ -50,13 +60,17 @@ class ComboButtonsAdapter(private val mListener: ComboButtonsAdapterListener, pr
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 holder.mView.tooltipText = combo.longLabel
             }
-            // TODO: selected button should not be clickable
+
             holder.mView.setOnClickListener { view: View ->
                 if (!mSlc.isSelected(position)) {
                     mSlc.set(position)
                     mSelectedView.alpha = 0.5f
-                    mSelectedView = view
+                    mSelectedView.paintFlags = 0
+                    mSelectedView.isClickable = true
+                    mSelectedView = view as Button
                     mSelectedView.alpha = 1f
+                    mSelectedView.paintFlags = holder.mView.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                    mSelectedView.isClickable = false
                     mListener.onComboChange(mSlc.language, mSlc.service)
                 }
             }

app/src/main/java/ee/ioc/phon/android/speak/service/SpeechInputMethodService.java

@@ -457,7 +457,9 @@ public void onAction(int editorAction, boolean hide) {
                 if (hide) {
                     closeSession();
                 }
-                runOp(mCommandEditor.imeAction(editorAction));
+                if (editorAction > 0) {
+                    runOp(mCommandEditor.imeAction(editorAction));
+                }
                 if (hide) {
                     requestHideSelf(0);
                 }

app/src/main/java/ee/ioc/phon/android/speak/service/WebSocketRecognitionService.java

@@ -11,6 +11,8 @@
 import android.speech.SpeechRecognizer;
 import android.util.Pair;
 
+import androidx.annotation.RequiresPermission;
+
 import com.koushikdutta.async.http.AsyncHttpClient;
 import com.koushikdutta.async.http.WebSocket;
 
@@ -30,6 +32,8 @@
 import ee.ioc.phon.android.speechutils.service.AbstractRecognitionService;
 import ee.ioc.phon.android.speechutils.utils.PreferenceUtils;
 
+import static android.Manifest.permission.RECORD_AUDIO;
+
 /**
  * Implements RecognitionService, connects to the server via WebSocket.
  */
@@ -67,6 +71,7 @@ public class WebSocketRecognitionService extends AbstractRecognitionService {
 
     private int mNumBytesSent;
 
+    @RequiresPermission(RECORD_AUDIO)
     @Override
     protected void configure(Intent recognizerIntent) throws IOException {
         Bundle bundle = getExtras();

app/src/main/java/ee/ioc/phon/android/speak/view/ComboSelectorView.kt

@@ -20,9 +20,9 @@ import ee.ioc.phon.android.speak.model.CallerInfo
 import ee.ioc.phon.android.speak.model.Combo
 
 class ComboSelectorView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
 ) : LinearLayoutCompat(context, attrs, defStyleAttr) {
 
     private lateinit var mSlc: ServiceLanguageChooser
@@ -35,9 +35,10 @@ class ComboSelectorView @JvmOverloads constructor(
 
     init {
         context.theme.obtainStyledAttributes(
-                attrs,
-                R.styleable.ComboSelectorView,
-                0, 0).apply {
+            attrs,
+            R.styleable.ComboSelectorView,
+            0, 0
+        ).apply {
 
             try {
                 mMinButtons = getInteger(R.styleable.ComboSelectorView_minButtons, 3)
@@ -47,7 +48,15 @@ class ComboSelectorView @JvmOverloads constructor(
         }
     }
 
-    fun init(context: Context, prefs: SharedPreferences?, keys: Int, callerInfo: CallerInfo?, appId: String?, key: Int, listener: ComboSelectorListener) {
+    fun init(
+        context: Context,
+        prefs: SharedPreferences?,
+        keys: Int,
+        callerInfo: CallerInfo?,
+        appId: String?,
+        key: Int,
+        listener: ComboSelectorListener
+    ) {
         // TODO: check for null? (test by deinstalling a recognizer but not changing K6nele settings)
         mSlc = ServiceLanguageChooser(context, prefs, keys, callerInfo, appId)
         mListener = listener

app/src/main/java/ee/ioc/phon/android/speak/view/OnCursorTouchListener.java

@@ -24,7 +24,8 @@ public class OnCursorTouchListener implements View.OnTouchListener {
     private final Handler mHandlerPress = new GestureHandler(this);
 
     // TODO: calculate dynamically
-    private static final float VERTICAL_SPEED = 3.5f;
+    // TODO: swiping up should be much faster
+    private static final float VERTICAL_SPEED = 5f;
     private static final float DISTANCE_SCALE = 0.04f;
 
     private final int mEdge;
@@ -194,8 +195,8 @@ public boolean onTouch(View v, MotionEvent event) {
     }
 
     private void cancelEdge() {
-        if (mHandler != null) mHandler.removeCallbacks(mTask1);
-        if (mHandler != null) mHandler.removeCallbacks(mTask2);
+        mHandler.removeCallbacks(mTask1);
+        mHandler.removeCallbacks(mTask2);
         mIsEdge = false;
     }
 
@@ -224,7 +225,7 @@ private float getDistance(float startX, float startY, MotionEvent ev) {
             startY = hy;
         }
         // add distance from last historical point to event's point
-        */
+         */
         float dx = (ev.getX(0) - startX);
         float dy = VERTICAL_SPEED * (ev.getY(0) - startY);
         distanceSum += Math.sqrt(dx * dx + dy * dy);