srctree

Robin Linden parent f71e0415 57bb5309
Extract the ongoing call banner into its own view

inlinesplit
atox/src/main/kotlin/ui/chat/ChatFragment.kt added: 56, removed: 51, total 5
@@ -177,7 +177,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>(FragmentChatBinding::infl
it.name = it.name.ifEmpty { getString(R.string.contact_default_name) }
 
contactName = it.name
ongoingCallInfo.text = getString(R.string.in_call_with, contactName)
ongoingCall.info.text = getString(R.string.in_call_with, contactName)
viewModel.contactOnline = it.connectionStatus != ConnectionStatus.None
 
title.text = contactName
@@ -219,25 +219,25 @@ class ChatFragment : BaseFragment<FragmentChatBinding>(FragmentChatBinding::infl
 
viewModel.ongoingCall.observe(viewLifecycleOwner) {
if (it is CallState.InCall && it.publicKey.string() == contactPubKey) {
ongoingCallContainer.visibility = View.VISIBLE
ongoingCall.container.visibility = View.VISIBLE
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
ongoingCallDuration.visibility = View.VISIBLE
ongoingCallDuration.base = it.startTime
ongoingCallDuration.isCountDown = false
ongoingCallDuration.start()
ongoingCall.duration.visibility = View.VISIBLE
ongoingCall.duration.base = it.startTime
ongoingCall.duration.isCountDown = false
ongoingCall.duration.start()
} else {
ongoingCallDuration.visibility = View.GONE
ongoingCall.duration.visibility = View.GONE
}
} else {
ongoingCallContainer.visibility = View.GONE
ongoingCall.container.visibility = View.GONE
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
ongoingCallDuration.stop()
ongoingCall.duration.stop()
}
}
}
 
ongoingCallEnd.setOnClickListener { viewModel.onEndCall() }
ongoingCallInfo.setOnClickListener { navigateToCallScreen() }
ongoingCall.endCall.setOnClickListener { viewModel.onEndCall() }
ongoingCall.info.setOnClickListener { navigateToCallScreen() }
 
val adapter = ChatAdapter(layoutInflater, resources)
messages.adapter = adapter
 
atox/src/main/res/layout/fragment_chat.xml added: 56, removed: 51, total 5
@@ -39,42 +39,7 @@
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
 
<androidx.cardview.widget.CardView android:id="@+id/ongoingCallContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Chronometer android:id="@+id/ongoingCallDuration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView android:id="@+id/ongoingCallInfo"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:padding="8dp"
android:textAlignment="center"
app:layout_constraintLeft_toRightOf="@id/ongoingCallDuration"
app:layout_constraintRight_toLeftOf="@id/ongoingCallEnd"
app:layout_constraintTop_toTopOf="parent"
tools:text="In call with subject"/>
<Button android:id="@+id/ongoingCallEnd"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="@string/end_call"
android:textColor="@android:color/holo_red_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/ongoingCallInfo"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<include android:id="@+id/ongoingCall" layout="@layout/view_ongoing_call"/>
 
<ListView android:id="@+id/messages"
android:layout_width="0dp"
@@ -88,7 +53,7 @@
app:layout_constraintBottom_toTopOf="@+id/bottomBar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ongoingCallContainer"/>
app:layout_constraintTop_toBottomOf="@id/ongoingCall"/>
 
<LinearLayout android:id="@+id/bottomBar"
android:layout_width="match_parent"
 
filename was Deleted added: 56, removed: 51, total 5
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Chronometer android:id="@+id/duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView android:id="@+id/info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:padding="8dp"
android:textAlignment="center"
app:layout_constraintLeft_toRightOf="@id/duration"
app:layout_constraintRight_toLeftOf="@id/end_call"
app:layout_constraintTop_toTopOf="parent"
tools:text="In call with subject"/>
<Button android:id="@+id/end_call"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="@string/end_call"
android:textColor="@android:color/holo_red_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/info"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>