From a703299aae9944f8293447d023b64ec70f26d8d9 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 31 Mar 2020 17:42:43 +0200
Subject: [PATCH] Only show clear field button when field has focus + don't
 empty field but set default value

---
 .../activities/call/viewmodels/ControlsViewModel.kt        | 5 +++--
 app/src/main/java/org/linphone/utils/DataBindingUtils.kt   | 7 +++++++
 app/src/main/res/layout/settings_widget_text.xml           | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
index dc9c86dab..f1c8f5fd3 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
@@ -103,11 +103,12 @@ class ControlsViewModel : ViewModel() {
         }
 
         override fun onAudioDeviceChanged(core: Core, audioDevice: AudioDevice) {
-            updateAudioRelated()
+            updateSpeakerState()
+            updateBluetoothHeadsetState()
         }
 
         override fun onAudioDevicesListUpdated(core: Core) {
-            updateAudioRelated()
+            updateAudioRoutesState()
         }
     }
 
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index b045d6d06..d0699e193 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -154,6 +154,13 @@ fun editTextSetting(view: EditText, lambda: () -> Unit) {
     })
 }
 
+@BindingAdapter("onFocusChangeVisibilityOf")
+fun setEditTextOnFocusChangeVisibilityOf(editText: EditText, view: View) {
+    editText.setOnFocusChangeListener { _, hasFocus ->
+        view.visibility = if (hasFocus) View.VISIBLE else View.INVISIBLE
+    }
+}
+
 @BindingAdapter("selectedIndex", "settingListener")
 fun spinnerSetting(spinner: Spinner, selectedIndex: Int, listener: SettingListener) {
     spinner.setSelection(selectedIndex, true)
diff --git a/app/src/main/res/layout/settings_widget_text.xml b/app/src/main/res/layout/settings_widget_text.xml
index c9f347e4e..866c241d8 100644
--- a/app/src/main/res/layout/settings_widget_text.xml
+++ b/app/src/main/res/layout/settings_widget_text.xml
@@ -31,7 +31,8 @@
 
         <ImageView
             android:id="@+id/settings_clear_input"
-            android:onClick="@{() -> settingsInput.setText(``)}"
+            android:onClick="@{() -> settingsInput.setText(defaultValue)}"
+            android:visibility="invisible"
             android:contentDescription="@string/content_description_clear_field"
             android:layout_width="20dp"
             android:layout_height="20dp"
@@ -57,6 +58,7 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/settings_input"
                 onValueChanged="@{() -> listener.onTextValueChanged(settingsInput.getText().toString())}"
+                onFocusChangeVisibilityOf="@{settingsClearInput}"
                 android:text="@{defaultValue}"
                 android:imeOptions="actionDone"
                 android:inputType="@{inputType ?? InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS}"