From acef5052253130b062533bb28644a81447752ae7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 12 Jan 2021 15:42:56 +0100 Subject: [PATCH] Use correct search icon + added screenshot button (hidden by default) --- .../call/viewmodels/CallsViewModel.kt | 4 ++++ .../call/viewmodels/ControlsViewModel.kt | 4 ++++ .../java/org/linphone/core/CorePreferences.kt | 3 +++ .../res/drawable-xhdpi/screenshot_default.png | Bin 0 -> 5657 bytes .../drawable-xhdpi/screenshot_disabled.png | Bin 0 -> 5284 bytes .../res/drawable-xhdpi/screenshot_over.png | Bin 0 -> 5665 bytes app/src/main/res/drawable-xhdpi/search.png | Bin 0 -> 1941 bytes .../drawable/{pause.xml => call_pause.xml} | 0 app/src/main/res/drawable/call_screenshot.xml | 8 ++++++++ .../layout-land/call_controls_fragment.xml | 2 +- .../contact_master_fragment.xml | 2 +- .../res/layout/call_controls_fragment.xml | 19 +++++++++++++++--- app/src/main/res/layout/call_paused.xml | 2 +- .../layout/chat_room_creation_fragment.xml | 2 +- .../res/layout/contact_master_fragment.xml | 2 +- app/src/main/res/values/strings.xml | 1 + 16 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/screenshot_default.png create mode 100644 app/src/main/res/drawable-xhdpi/screenshot_disabled.png create mode 100644 app/src/main/res/drawable-xhdpi/screenshot_over.png create mode 100644 app/src/main/res/drawable-xhdpi/search.png rename app/src/main/res/drawable/{pause.xml => call_pause.xml} (100%) create mode 100644 app/src/main/res/drawable/call_screenshot.xml diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt index 5c4d8de6d..625ce903f 100644 --- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt +++ b/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() list.addAll(pausedCalls.value.orEmpty()) 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 c618e9b7e..2e5c5375f 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 @@ -72,6 +72,8 @@ class ControlsViewModel : ViewModel() { val audioRoutesEnabled = MutableLiveData() + val takeScreenshotEnabled = MutableLiveData() + val chatClickedEvent: MutableLiveData> by lazy { MutableLiveData>() } @@ -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() } diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt index f80fb40d7..1514e1bc7 100644 --- a/app/src/main/java/org/linphone/core/CorePreferences.kt +++ b/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 diff --git a/app/src/main/res/drawable-xhdpi/screenshot_default.png b/app/src/main/res/drawable-xhdpi/screenshot_default.png new file mode 100644 index 0000000000000000000000000000000000000000..a322b072b11020fd23218a9e116268dd968b142b GIT binary patch literal 5657 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 WyL3Z1ok5uZ0Jy3StWw$L&Hn)gi|a7} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/screenshot_disabled.png b/app/src/main/res/drawable-xhdpi/screenshot_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..9b75d575bb8621baba239926f576d810f942a7aa GIT binary patch literal 5284 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 bCjj^tEx%14hStZh00000NkvXXu0mjfy@Y$? literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/pause.xml b/app/src/main/res/drawable/call_pause.xml similarity index 100% rename from app/src/main/res/drawable/pause.xml rename to app/src/main/res/drawable/call_pause.xml diff --git a/app/src/main/res/drawable/call_screenshot.xml b/app/src/main/res/drawable/call_screenshot.xml new file mode 100644 index 000000000..2d24a03e3 --- /dev/null +++ b/app/src/main/res/drawable/call_screenshot.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/src/main/res/layout-land/call_controls_fragment.xml b/app/src/main/res/layout-land/call_controls_fragment.xml index 20dd6c62e..9165b6774 100644 --- a/app/src/main/res/layout-land/call_controls_fragment.xml +++ b/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" /> + android:src="@drawable/call_pause" /> @@ -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" /> @@ -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" /> + + + android:src="@drawable/call_pause" /> diff --git a/app/src/main/res/layout/chat_room_creation_fragment.xml b/app/src/main/res/layout/chat_room_creation_fragment.xml index b5b001848..6dd11c63e 100644 --- a/app/src/main/res/layout/chat_room_creation_fragment.xml +++ b/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" diff --git a/app/src/main/res/layout/contact_master_fragment.xml b/app/src/main/res/layout/contact_master_fragment.xml index 2fc9aa233..d3e6c7982 100644 --- a/app/src/main/res/layout/contact_master_fragment.xml +++ b/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" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61ea700f7..af59a5535 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -704,4 +704,5 @@ Call security is pending Show or hide call statistics Video attachment + Take a screenshot of received video