Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed dialer cursor position when using numpad or erase button instead of keyboard

Browse source
This commit is contained in:
Sylvain Berfini 2021-04-23 17:42:34 +02:00
parent 5ddc3f7ff0
commit 30bd928b78
5 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/org/linphone/activities/main/dialer/viewmodels/DialerViewModel.kt
View file

@ -22,6 +22,7 @@ package org.linphone.activities.main.dialer.viewmodels
import android.content.Context
import android.os.Vibrator
import android.provider.Settings
import android.text.Editable
import android.widget.EditText
import androidx.lifecycle.MutableLiveData
import org.linphone.LinphoneApplication.Companion.coreContext
@ -56,9 +57,14 @@ class DialerViewModel : LogsUploadViewModel() {
private var addressWaitingNetworkToBeCalled: String? = null
private var timeAtWitchWeTriedToCall: Long = 0
private var enteredUriCursorPosition: Int = 0
val onKeyClick: NumpadDigitListener = object : NumpadDigitListener {
override fun handleClick(key: Char) {
enteredUri.value += key.toString()
val sb: StringBuilder = StringBuilder(enteredUri.value)
sb.insert(enteredUriCursorPosition, key.toString())
enteredUri.value = sb.toString()
if (coreContext.core.callsNb == 0) {
val contentResolver = coreContext.context.contentResolver
if (Settings.System.getInt(contentResolver, Settings.System.DTMF_TONE_WHEN_DIALING) == 1) {
@ -142,8 +148,16 @@ class DialerViewModel : LogsUploadViewModel() {
}
// This is to workaround the cursor being set to the start when pressing a digit
fun onUriChanged(input: EditText) {
input.setSelection(input.text.length)
fun onBeforeUriChanged(editText: EditText, count: Int, after: Int) {
enteredUriCursorPosition = editText.selectionEnd
enteredUriCursorPosition += after - count
}
fun onAfterUriChanged(editText: EditText, editable: Editable?) {
val newLength = editable?.length ?: 0
if (newLength <= enteredUriCursorPosition) enteredUriCursorPosition = newLength
if (enteredUriCursorPosition < 0) enteredUriCursorPosition = 0
editText.setSelection(enteredUriCursorPosition)
}
fun updateShowVideoPreview() {

3
app/src/main/res/layout-land/dialer_fragment.xml
View file

@ -40,7 +40,10 @@
android:src="@drawable/backspace" />
<EditText
android:id="@+id/sip_uri_input"
android:text="@={viewModel.enteredUri}"
android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"

3
app/src/main/res/layout-sw533dp-land/dialer_fragment.xml
View file

@ -81,7 +81,10 @@
android:src="@drawable/backspace" />
<EditText
android:id="@+id/sip_uri_input"
android:text="@={viewModel.enteredUri}"
android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"

3
app/src/main/res/layout-sw533dp/dialer_fragment.xml
View file

@ -81,7 +81,10 @@
android:src="@drawable/backspace" />
<EditText
android:id="@+id/sip_uri_input"
android:text="@={viewModel.enteredUri}"
android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"

3
app/src/main/res/layout/dialer_fragment.xml
View file

@ -43,7 +43,8 @@
<EditText
android:id="@+id/sip_uri_input"
android:text="@={viewModel.enteredUri}"
android:onTextChanged="@{(text, start, before, count) -> viewModel.onUriChanged(sipUriInput)}"
android:beforeTextChanged="@{(text, start, count, after) -> viewModel.onBeforeUriChanged(sipUriInput, count, after)}"
android:afterTextChanged="@{(text) -> viewModel.onAfterUriChanged(sipUriInput, text)}"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"