mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added back spinner on incoming/outgoing call fragments, removed chronometer

Browse source
This commit is contained in:
Sylvain Berfini 2024-11-22 11:53:04 +01:00
parent f3a2020466
commit 8d78f2b698
6 changed files with 47 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/linphone/ui/call/fragment/IncomingCallFragment.kt
View file

@ -20,7 +20,6 @@
package org.linphone.ui.call.fragment
import android.os.Bundle
import android.os.SystemClock
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -53,10 +52,5 @@ class IncomingCallFragment : GenericCallFragment() {
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = callViewModel
callViewModel.callDuration.observe(viewLifecycleOwner) { duration ->
binding.chronometer.base = SystemClock.elapsedRealtime() - (1000 * duration)
binding.chronometer.start()
}
}
}

6
app/src/main/java/org/linphone/ui/call/fragment/OutgoingCallFragment.kt
View file

@ -20,7 +20,6 @@
package org.linphone.ui.call.fragment
import android.os.Bundle
import android.os.SystemClock
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@ -53,10 +52,5 @@ class OutgoingCallFragment : GenericCallFragment() {
binding.lifecycleOwner = viewLifecycleOwner
binding.viewModel = callViewModel
callViewModel.callDuration.observe(viewLifecycleOwner) { duration ->
binding.chronometer.base = SystemClock.elapsedRealtime() - (1000 * duration)
binding.chronometer.start()
}
}
}

38
app/src/main/res/layout-land/call_incoming_fragment.xml
View file

@ -39,27 +39,6 @@
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/call_header_style"
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="@string/vertical_separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"
app:layout_constraintStart_toEndOf="@id/call_direction_label"
app:layout_constraintEnd_toStartOf="@id/chronometer"/>
<Chronometer
style="@style/call_header_style"
android:id="@+id/chronometer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
<include
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
@ -99,12 +78,25 @@
android:id="@+id/address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}"
android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
android:textColor="@color/white"
android:textSize="14sp" />
android:textSize="14sp"
android:visibility="@{viewModel.conferenceModel.isCurrentCallInConference ? View.GONE : View.VISIBLE}" />
</LinearLayout>
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/in_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:indicatorColor="@color/white"
app:indicatorSize="28dp"
app:layout_constraintStart_toEndOf="@id/name_address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/name_address"
app:layout_constraintBottom_toBottomOf="@id/name_address" />
<include
bind:viewModel="@{viewModel}"
android:id="@+id/bottom_bar"

33
app/src/main/res/layout-land/call_outgoing_fragment.xml
View file

@ -39,27 +39,6 @@
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/call_header_style"
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="@string/vertical_separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"
app:layout_constraintStart_toEndOf="@id/call_direction_label"
app:layout_constraintEnd_toStartOf="@id/chronometer"/>
<Chronometer
style="@style/call_header_style"
android:id="@+id/chronometer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
<include
android:id="@+id/avatar"
android:layout_width="@dimen/avatar_in_call_size"
@ -105,6 +84,18 @@
</LinearLayout>
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/in_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:indicatorColor="@color/white"
app:indicatorSize="28dp"
app:layout_constraintStart_toEndOf="@id/name_address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/name_address"
app:layout_constraintBottom_toBottomOf="@id/name_address" />
<include
bind:viewModel="@{viewModel}"
android:id="@+id/bottom_bar"

28
app/src/main/res/layout/call_incoming_fragment.xml
View file

@ -39,26 +39,18 @@
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/call_header_style"
android:id="@+id/separator"
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/in_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="@string/vertical_separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"
app:layout_constraintStart_toEndOf="@id/call_direction_label"
app:layout_constraintEnd_toStartOf="@id/chronometer"/>
<Chronometer
style="@style/call_header_style"
android:id="@+id/chronometer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
android:layout_marginBottom="5dp"
android:indeterminate="true"
app:indicatorColor="@color/white"
app:indicatorSize="28dp"
app:layout_constraintStart_toStartOf="@id/avatar"
app:layout_constraintEnd_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/call_direction_label"
app:layout_constraintBottom_toTopOf="@id/avatar" />
<include
android:id="@+id/avatar"

28
app/src/main/res/layout/call_outgoing_fragment.xml
View file

@ -39,26 +39,18 @@
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/call_header_style"
android:id="@+id/separator"
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/in_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:text="@string/vertical_separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"
app:layout_constraintStart_toEndOf="@id/call_direction_label"
app:layout_constraintEnd_toStartOf="@id/chronometer"/>
<Chronometer
style="@style/call_header_style"
android:id="@+id/chronometer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.isPaused || viewModel.isPausedByRemote ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
android:layout_marginBottom="5dp"
android:indeterminate="true"
app:indicatorColor="@color/white"
app:indicatorSize="28dp"
app:layout_constraintStart_toStartOf="@id/avatar"
app:layout_constraintEnd_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/call_direction_label"
app:layout_constraintBottom_toTopOf="@id/avatar" />
<include
android:id="@+id/avatar"