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

Hide switch camera button if less than 2 cameras

Browse source
This commit is contained in:
Sylvain Berfini 2020-04-24 16:12:22 +02:00
parent e53db5491a
commit 8e330ce664
8 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/assistant/viewmodels/QrCodeViewModel.kt
View file

@ -41,7 +41,7 @@ class QrCodeViewModel : ViewModel() {
init {
coreContext.core.addListener(listener)
showSwitchCamera.value = coreContext.core.videoDevicesList.size > 1
showSwitchCamera.value = coreContext.showSwitchCameraButton()
}
override fun onCleared() {

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

@ -44,6 +44,8 @@ class ControlsViewModel : ViewModel() {
val isVideoUpdateInProgress = MutableLiveData<Boolean>()
val showSwitchCamera = MutableLiveData<Boolean>()
val isPauseEnabled = MutableLiveData<Boolean>()
val isRecording = MutableLiveData<Boolean>()
@ -129,6 +131,7 @@ class ControlsViewModel : ViewModel() {
isRecording.value = currentCall?.isRecording
isVideoUpdateInProgress.value = false
showSwitchCamera.value = coreContext.showSwitchCameraButton()
updateUI()
}

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

@ -35,6 +35,8 @@ class DialerViewModel : ViewModel() {
val showPreview = MutableLiveData<Boolean>()
val showSwitchCamera = MutableLiveData<Boolean>()
val onKeyClick: NumpadDigitListener = object : NumpadDigitListener {
override fun handleClick(key: Char) {
enteredUri.value += key.toString()
@ -73,6 +75,8 @@ class DialerViewModel : ViewModel() {
enteredUri.value = ""
atLeastOneCall.value = coreContext.core.callsNb > 0
transferVisibility.value = false
showSwitchCamera.value = coreContext.showSwitchCameraButton()
}
override fun onCleared() {

4
app/src/main/java/org/linphone/core/CoreContext.kt
View file

@ -363,6 +363,10 @@ class CoreContext(val context: Context, coreConfig: Config) {
call.update(null)
}
fun showSwitchCameraButton(): Boolean {
return core.videoDevicesList.orEmpty().size > 2 // Count StaticImage camera
}
fun createCallOverlay() {
if (!corePreferences.showCallOverlay || callOverlay != null) {
return

2
app/src/main/res/layout-land/call_controls_fragment.xml
View file

@ -116,7 +116,7 @@
<ImageView
android:onClick="@{() -> controlsViewModel.switchCamera()}"
android:enabled="@{!viewModel.callPausedByRemote}"
android:visibility="@{controlsViewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
android:contentDescription="@string/content_description_switch_camera"
android:layout_width="50dp"
android:layout_height="50dp"

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

@ -63,7 +63,7 @@
<ImageView
android:onClick="@{() -> viewModel.switchCamera()}"
android:visibility="@{viewModel.showPreview ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{viewModel.showPreview &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
android:contentDescription="@string/content_description_switch_camera"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"

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

@ -60,7 +60,7 @@
<ImageView
android:onClick="@{() -> viewModel.switchCamera()}"
android:visibility="@{viewModel.showPreview ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{viewModel.showPreview &amp;&amp; viewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
android:contentDescription="@string/content_description_switch_camera"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"

2
app/src/main/res/layout/call_controls_fragment.xml
View file

@ -208,7 +208,7 @@
<ImageView
android:onClick="@{() -> controlsViewModel.switchCamera()}"
android:enabled="@{!viewModel.callPausedByRemote}"
android:visibility="@{controlsViewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.showSwitchCamera ? View.VISIBLE : View.GONE, default=gone}"
android:contentDescription="@string/content_description_switch_camera"
android:layout_width="50dp"
android:layout_height="50dp"