From 052d7cc52266ee25f65e9566203c111faed8b923 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 17 Mar 2025 14:19:14 +0100
Subject: [PATCH] Added UI setting to have dialpad automatically opened when
 starting new call

---
 .../java/org/linphone/core/CorePreferences.kt | 11 ++++---
 .../settings/viewmodel/SettingsViewModel.kt   | 12 ++++++++
 .../res/layout/settings_user_interface.xml    | 30 ++++++++++++++++++-
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 7c0274237..4b2bdb07b 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -234,6 +234,13 @@ class CorePreferences
             config.setBool("ui", "enable_secure_mode", value)
         }
 
+    @get:WorkerThread @set:WorkerThread
+    var automaticallyShowDialpad: Boolean
+        get() = config.getBool("ui", "automatically_show_dialpad", false)
+        set(value) {
+            config.setBool("ui", "automatically_show_dialpad", value)
+        }
+
     @get:WorkerThread @set:WorkerThread
     var themeMainColor: String
         get() = config.getString("ui", "theme_main_color", "orange")!!
@@ -325,10 +332,6 @@ class CorePreferences
     val fetchContactsFromDefaultDirectory: Boolean
         get() = config.getBool("app", "fetch_contacts_from_default_directory", true)
 
-    @get:WorkerThread
-    val automaticallyShowDialpad: Boolean
-        get() = config.getBool("ui", "automatically_show_dialpad", false)
-
     @get:WorkerThread
     val showLettersOnDialpad: Boolean
         get() = config.getBool("ui", "show_letters_on_dialpad", true)
diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
index e065446ab..653d51386 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/SettingsViewModel.kt
@@ -142,6 +142,8 @@ class SettingsViewModel
     val allowIpv6 = MutableLiveData<Boolean>()
 
     // User Interface settings
+    val autoShowDialpad = MutableLiveData<Boolean>()
+
     val showThemeSelector = MutableLiveData<Boolean>()
     val theme = MutableLiveData<Int>()
     val availableThemesNames = arrayListOf(
@@ -305,6 +307,7 @@ class SettingsViewModel
 
             defaultLayout.postValue(core.defaultConferenceLayout.toInt())
 
+            autoShowDialpad.postValue(corePreferences.automaticallyShowDialpad)
             theme.postValue(corePreferences.darkMode)
             color.postValue(corePreferences.themeMainColor)
 
@@ -580,6 +583,15 @@ class SettingsViewModel
         expandUserInterface.value = expandUserInterface.value == false
     }
 
+    @UiThread
+    fun toggleAutoShowDialpad() {
+        val newValue = autoShowDialpad.value == false
+        coreContext.postOnCoreThread { core ->
+            corePreferences.automaticallyShowDialpad = newValue
+            autoShowDialpad.postValue(newValue)
+        }
+    }
+
     @UiThread
     fun setTheme(themeValue: Int) {
         coreContext.postOnCoreThread {
diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml
index 467b78693..f392d2593 100644
--- a/app/src/main/res/layout/settings_user_interface.xml
+++ b/app/src/main/res/layout/settings_user_interface.xml
@@ -28,6 +28,34 @@
             android:visibility="@{viewModel.showColorSelector ? View.VISIBLE : View.GONE}"
             app:constraint_referenced_ids="color_spinner, color_spinner_caret, color_title" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            style="@style/settings_title_style"
+            android:id="@+id/auto_show_dialpad_title"
+            android:onClick="@{() -> viewModel.toggleAutoShowDialpad()}"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="10dp"
+            android:text="@string/settings_user_interface_auto_show_dialpad_title"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintTop_toTopOf="@id/auto_show_dialpad_switch"
+            app:layout_constraintBottom_toBottomOf="@id/auto_show_dialpad_switch"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/auto_show_dialpad_switch"/>
+
+        <com.google.android.material.materialswitch.MaterialSwitch
+            style="@style/material_switch_style"
+            android:id="@+id/auto_show_dialpad_switch"
+            android:onClick="@{() -> viewModel.toggleAutoShowDialpad()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
+            android:checked="@{viewModel.autoShowDialpad}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/settings_title_style"
             android:id="@+id/theme_title"
@@ -39,7 +67,7 @@
             android:text="@string/settings_user_interface_theme_title"
             android:maxLines="2"
             android:ellipsize="end"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/auto_show_dialpad_switch"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 39768eb43..e2d41d9e1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -243,6 +243,7 @@
     <string name="settings_network_use_wifi_only">Se connecter uniquement via le Wi-Fi</string>
     <string name="settings_network_allow_ipv6">Autoriser l\'IPv6</string>
     <string name="settings_user_interface_title">Affichage</string>
+    <string name="settings_user_interface_auto_show_dialpad_title">Ouvrir le pavé numérique automatiquement</string>
     <string name="settings_user_interface_theme_title">Thème</string>
     <string name="settings_user_interface_dark_theme_label">Sombre</string>
     <string name="settings_user_interface_light_theme_label">Clair</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ab53dd0a..d72a82dc0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -282,6 +282,7 @@
     <string name="settings_network_use_wifi_only">Use only Wi-Fi networks</string>
     <string name="settings_network_allow_ipv6">Allow IPv6</string>
     <string name="settings_user_interface_title">User interface</string>
+    <string name="settings_user_interface_auto_show_dialpad_title">Automatically open dialpad</string>
     <string name="settings_user_interface_theme_title">Theme</string>
     <string name="settings_user_interface_dark_theme_label">Dark theme</string>
     <string name="settings_user_interface_light_theme_label">Light theme</string>