Use correct search icon + added screenshot button (hidden by default)

app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt

@@ -146,6 +146,10 @@ class CallsViewModel : ViewModel() {
         }
     }
 
+    fun takeScreenshot() {
+        currentCallViewModel.value?.takeScreenshot()
+    }
+
     private fun addCallToPausedList(call: Call) {
         val list = arrayListOf<CallViewModel>()
         list.addAll(pausedCalls.value.orEmpty())

app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt

@@ -72,6 +72,8 @@ class ControlsViewModel : ViewModel() {
 
     val audioRoutesEnabled = MutableLiveData<Boolean>()
 
+    val takeScreenshotEnabled = MutableLiveData<Boolean>()
+
     val chatClickedEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -210,6 +212,8 @@ class ControlsViewModel : ViewModel() {
         optionsMenuTranslateY.value = AppUtils.getDimension(R.dimen.call_options_menu_translate_y)
         audioRoutesMenuTranslateY.value = AppUtils.getDimension(R.dimen.call_audio_routes_menu_translate_y)
 
+        takeScreenshotEnabled.value = corePreferences.showScreenshotButton
+
         updateUI()
         if (corePreferences.enableAnimations) bounceAnimator.start()
     }

app/src/main/java/org/linphone/core/CorePreferences.kt

@@ -325,6 +325,9 @@ class CorePreferences constructor(private val context: Context) {
     val disableChat: Boolean
         get() = config.getBool("app", "disable_chat_feature", false)
 
+    val showScreenshotButton: Boolean
+        get() = config.getBool("app", "show_take_screenshot_button_in_call", false)
+
     /* Assistant */
 
     val showCreateAccount: Boolean

app/src/main/res/drawable/call_screenshot.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/screenshot_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/screenshot_over" android:state_selected="true" />
+    <item android:drawable="@drawable/screenshot_over" android:state_pressed="true" />
+    <item android:drawable="@drawable/screenshot_default" />
+</selector>
+

app/src/main/res/layout-land/call_controls_fragment.xml

@@ -112,7 +112,7 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentRight="true"
             android:layout_margin="20dp"
-            android:src="@drawable/pause" />
+            android:src="@drawable/call_pause" />
 
         <ImageView
             android:onClick="@{() -> controlsViewModel.switchCamera()}"

app/src/main/res/layout-sw533dp/contact_master_fragment.xml

@@ -136,7 +136,7 @@
                     android:inputType="textPersonName"
                     android:layout_below="@id/top_bar"
                     android:layout_margin="10dp"
-                    android:drawableLeft="@android:drawable/ic_menu_search"
+                    android:drawableLeft="@drawable/search"
                     android:drawablePadding="10dp"
                     android:background="@color/transparent_color"
                     android:backgroundTint="@color/transparent_color"

app/src/main/res/layout/call_controls_fragment.xml

@@ -99,7 +99,7 @@
                     android:adjustViewBounds="true"
                     android:padding="10dp"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/pause" />
+                    android:src="@drawable/call_pause" />
 
             </RelativeLayout>
 
@@ -203,7 +203,7 @@
                 android:layout_height="40dp"
                 android:gravity="center_vertical"
                 android:contentDescription="@string/content_description_resume_conference"
-                android:src="@drawable/pause" />
+                android:src="@drawable/call_pause" />
 
         </LinearLayout>
 
@@ -218,9 +218,10 @@
             android:layout_below="@id/active_call_header"
             android:layout_alignParentRight="true"
             android:layout_margin="20dp"
-            android:src="@drawable/pause" />
+            android:src="@drawable/call_pause" />
 
         <ImageView
+            android:id="@+id/switch_camera"
             android:onClick="@{() -> controlsViewModel.switchCamera()}"
             android:enabled="@{!viewModel.callPausedByRemote}"
             android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.showSwitchCamera &amp;&amp; (viewModel.conferenceCalls.size() == 0 || viewModel.isConferencePaused) ? View.VISIBLE : View.GONE, default=gone}"
@@ -232,6 +233,18 @@
             android:layout_margin="20dp"
             android:src="@drawable/switch_camera" />
 
+        <ImageView
+            android:onClick="@{() -> viewModel.takeScreenshot()}"
+            android:enabled="@{!viewModel.callPausedByRemote}"
+            android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.takeScreenshotEnabled &amp;&amp; (viewModel.conferenceCalls.size() == 0 || viewModel.isConferencePaused) ? View.VISIBLE : View.GONE, default=gone}"
+            android:contentDescription="@string/content_description_take_screenshot"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_below="@id/active_call_header"
+            android:layout_toRightOf="@id/switch_camera"
+            android:layout_margin="20dp"
+            android:src="@drawable/call_screenshot" />
+
         <ImageView
             android:onClick="@{() -> controlsViewModel.toggleRecording(false)}"
             android:visibility="@{controlsViewModel.isRecording ? View.VISIBLE : View.GONE, default=gone}"

app/src/main/res/layout/call_paused.xml

@@ -55,7 +55,7 @@
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:gravity="center_vertical"
-            android:src="@drawable/pause" />
+            android:src="@drawable/call_pause" />
 
     </LinearLayout>
 

app/src/main/res/layout/chat_room_creation_fragment.xml

@@ -156,7 +156,7 @@
             android:inputType="textPersonName"
             android:layout_below="@id/top_bar"
             android:layout_margin="10dp"
-            android:drawableLeft="@android:drawable/ic_menu_search"
+            android:drawableLeft="@drawable/search"
             android:drawablePadding="10dp"
             android:background="@color/transparent_color"
             android:backgroundTint="@color/transparent_color"

app/src/main/res/layout/contact_master_fragment.xml

@@ -126,7 +126,7 @@
             android:layout_below="@id/top_bar"
             android:layout_margin="10dp"
             android:inputType="textPersonName"
-            android:drawableLeft="@android:drawable/ic_menu_search"
+            android:drawableLeft="@drawable/search"
             android:drawablePadding="10dp"
             android:background="@color/transparent_color"
             android:backgroundTint="@color/transparent_color"

app/src/main/res/values/strings.xml

@@ -704,4 +704,5 @@
     <string name="content_description_call_security_pending">Call security is pending</string>
     <string name="content_description_toggle_call_stats">Show or hide call statistics</string>
     <string name="content_description_chat_message_video_attachment">Video attachment</string>
+    <string name="content_description_take_screenshot">Take a screenshot of received video</string>
 </resources>