From d13a0c2dea049feca4a62b47ba1ee902ffafbe6d Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 23 Nov 2020 11:38:42 +0100
Subject: [PATCH] Updated video settings to allow changing recv-fmtp of codecs

---
 .../fragments/VideoSettingsFragment.kt        |  13 +-
 .../main/res/layout/settings_widget_basic.xml |   4 +-
 .../main/res/layout/settings_widget_list.xml  |   4 +-
 .../res/layout/settings_widget_switch.xml     |   4 +-
 .../settings_widget_switch_and_text.xml       | 117 ++++++++++++++++++
 5 files changed, 130 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/layout/settings_widget_switch_and_text.xml

diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
index 5735326af..9203c1194 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/VideoSettingsFragment.kt
@@ -79,14 +79,21 @@ class VideoSettingsFragment : GenericFragment<SettingsVideoFragmentBinding>() {
     private fun initVideoCodecsList() {
         val list = arrayListOf<ViewDataBinding>()
         for (payload in coreContext.core.videoPayloadTypes) {
-            val binding = DataBindingUtil.inflate<ViewDataBinding>(LayoutInflater.from(requireContext()), R.layout.settings_widget_switch, null, false)
-            binding.setVariable(BR.title, payload.mimeType)
-            binding.setVariable(BR.subtitle, "")
+            val binding = DataBindingUtil.inflate<ViewDataBinding>(LayoutInflater.from(requireContext()), R.layout.settings_widget_switch_and_text, null, false)
+            binding.setVariable(BR.switch_title, payload.mimeType)
+            binding.setVariable(BR.switch_subtitle, "")
+            binding.setVariable(BR.text_title, "recv-fmtp")
+            binding.setVariable(BR.text_subtitle, "")
+            binding.setVariable(BR.defaultValue, payload.recvFmtp)
             binding.setVariable(BR.checked, payload.enabled())
             binding.setVariable(BR.listener, object : SettingListenerStub() {
                 override fun onBoolValueChanged(newValue: Boolean) {
                     payload.enable(newValue)
                 }
+
+                override fun onTextValueChanged(newValue: String) {
+                    payload.recvFmtp = newValue
+                }
             })
             binding.lifecycleOwner = this
             list.add(binding)
diff --git a/app/src/main/res/layout/settings_widget_basic.xml b/app/src/main/res/layout/settings_widget_basic.xml
index e9c2d2807..64f27ac66 100644
--- a/app/src/main/res/layout/settings_widget_basic.xml
+++ b/app/src/main/res/layout/settings_widget_basic.xml
@@ -21,9 +21,7 @@
         android:onClick="@{() -> listener.onClicked()}"
         android:enabled="@{enabled ?? true}"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_vertical|left">
+        android:layout_height="wrap_content">
 
         <org.linphone.views.MarqueeTextView
             android:id="@+id/settings_title"
diff --git a/app/src/main/res/layout/settings_widget_list.xml b/app/src/main/res/layout/settings_widget_list.xml
index b031605ba..18c3a50a7 100644
--- a/app/src/main/res/layout/settings_widget_list.xml
+++ b/app/src/main/res/layout/settings_widget_list.xml
@@ -26,9 +26,7 @@
     <RelativeLayout
         android:onClick="@{() -> listener.onClicked()}"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_vertical|left">
+        android:layout_height="wrap_content">
 
         <org.linphone.views.MarqueeTextView
             android:id="@+id/settings_title"
diff --git a/app/src/main/res/layout/settings_widget_switch.xml b/app/src/main/res/layout/settings_widget_switch.xml
index 1e6f2a0ba..e9c865edd 100644
--- a/app/src/main/res/layout/settings_widget_switch.xml
+++ b/app/src/main/res/layout/settings_widget_switch.xml
@@ -24,9 +24,7 @@
         android:enabled="@{enabled ?? true}"
         onClickToggleSwitch="@{@id/setting_switch}"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_vertical|left">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/setting_switch"
diff --git a/app/src/main/res/layout/settings_widget_switch_and_text.xml b/app/src/main/res/layout/settings_widget_switch_and_text.xml
new file mode 100644
index 000000000..c5ee960c4
--- /dev/null
+++ b/app/src/main/res/layout/settings_widget_switch_and_text.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View"/>
+        <import type="android.text.InputType"/>
+        <variable
+            name="switch_title"
+            type="String" />
+        <variable
+            name="switch_subtitle"
+            type="String" />
+        <variable
+            name="text_title"
+            type="String" />
+        <variable
+            name="text_subtitle"
+            type="String" />
+        <variable
+            name="defaultValue"
+            type="String" />
+        <variable
+            name="checked"
+            type="Boolean" />
+        <variable
+            name="enabled"
+            type="Boolean" />
+        <variable
+            name="listener"
+            type="org.linphone.activities.main.settings.SettingListener" />
+    </data>
+
+    <RelativeLayout
+        android:enabled="@{enabled ?? true}"
+        onClickToggleSwitch="@{@id/setting_switch}"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/setting_switch"
+            android:enabled="@{enabled ?? true}"
+            android:checked="@={checked}"
+            android:onCheckedChanged="@{(switch, value) -> listener.onBoolValueChanged(value)}"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <org.linphone.views.MarqueeTextView
+            android:id="@+id/settings_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@{switch_title}"
+            android:enabled="@{enabled ?? true}"
+            android:visibility="@{switch_title.length() > 0 ? View.VISIBLE : View.GONE}"
+            android:singleLine="true"
+            android:layout_toLeftOf="@id/setting_switch"
+            android:layout_marginTop="15dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            style="@style/settings_item_font"/>
+
+        <org.linphone.views.MarqueeTextView
+            android:id="@+id/settings_subtitle"
+            android:text="@{switch_subtitle}"
+            android:enabled="@{enabled ?? true}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="@{switch_subtitle.length() > 0 ? View.VISIBLE : View.GONE}"
+            android:singleLine="true"
+            android:layout_below="@id/settings_title"
+            android:layout_toLeftOf="@id/setting_switch"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            style="@style/settings_item_subtitle_font"/>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/settings_input_layout"
+            android:visibility="@{settingSwitch.checked ? View.VISIBLE : View.GONE}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/settings_subtitle"
+            android:layout_toLeftOf="@id/setting_switch"
+            android:layout_marginTop="5dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:enabled="@{enabled ?? true}"
+            android:hint="@{text_title}"
+            app:helperText="@{text_subtitle}"
+            app:helperTextEnabled="@{text_subtitle.length() > 0}">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/settings_input"
+                onValueChanged="@{() -> listener.onTextValueChanged(settingsInput.getText().toString())}"
+                android:text="@{defaultValue}"
+                android:imeOptions="actionDone"
+                android:inputType="@{InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS}"
+                android:singleLine="true"
+                android:background="@color/transparent_color"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <View
+            android:layout_marginTop="15dp"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@id/settings_input_layout"
+            android:background="?attr/dividerColor" />
+
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file