gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

show popup for leaving call in 1:1

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-11-08 15:33:27 +01:00 committed by Marcel Hibbe
parent 90628c34ce
commit 0920029183
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -671,16 +671,16 @@ class CallActivity : CallBaseActivity() {
if (isOneToOneConversation) { if (isOneToOneConversation) {
binding!!.hangupButton.setOnLongClickListener { binding!!.hangupButton.setOnLongClickListener {
hangup(true, false) showLeavePopupMenu()
true true
} }
binding!!.hangupButton.setOnClickListener { binding!!.hangupButton.setOnClickListener {
showPopupMenu() hangup(true, true)
} }
} else { } else {
if (isModerator) { if (isModerator) {
binding!!.hangupButton.setOnLongClickListener { binding!!.hangupButton.setOnLongClickListener {
showPopupMenu() showEndCallPopupMenu()
true true
} }
} }
@ -689,11 +689,19 @@ class CallActivity : CallBaseActivity() {
} }
} }
binding!!.popupMenu.setOnClickListener { if(!isOneToOneConversation){
hangup(true, true) binding!!.popupMenu.setOnClickListener {
binding!!.popupMenu.visibility = View.GONE hangup(true, true)
binding!!.popupMenu.visibility = View.GONE
}
}else{
binding!!.popupMenu.setOnClickListener {
hangup(true,false)
binding!!.popupMenu.visibility =View.GONE
}
} }
binding!!.switchSelfVideoButton.setOnClickListener { switchCamera() } binding!!.switchSelfVideoButton.setOnClickListener { switchCamera() }
binding!!.gridview.onItemClickListener = binding!!.gridview.onItemClickListener =
AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, _: Int, _: Long -> AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, _: Int, _: Long ->
@ -729,8 +737,15 @@ class CallActivity : CallBaseActivity() {
binding!!.lowerHandButton.setOnClickListener { l: View? -> raiseHandViewModel!!.lowerHand() } binding!!.lowerHandButton.setOnClickListener { l: View? -> raiseHandViewModel!!.lowerHand() }
} }
private fun showPopupMenu() { private fun showEndCallPopupMenu() {
binding!!.popupMenu.visibility = View.VISIBLE binding!!.popupMenu.visibility = View.VISIBLE
binding!!.popupMenu.text = context.getString(R.string.end_call_for_everyone)
}
private fun showLeavePopupMenu(){
binding!!.popupMenu.visibility = View.VISIBLE
binding!!.popupMenu.text = context.getString(R.string.leave_call)
} }
private fun createCameraEnumerator() { private fun createCameraEnumerator() {

4
app/src/main/res/layout/call_activity.xml
View File

@ -199,7 +199,6 @@
android:id="@+id/popup_menu" android:id="@+id/popup_menu"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/end_call_for_everyone"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible"
@ -208,7 +207,8 @@
app:icon="@drawable/ic_call_end_white_24px" app:icon="@drawable/ic_call_end_white_24px"
app:iconTint="@android:color/holo_red_light" app:iconTint="@android:color/holo_red_light"
app:iconGravity="textEnd" app:iconGravity="textEnd"
app:iconPadding="16dp" /> app:iconPadding="16dp"
tools:text="@string/end_call_for_everyone"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/lower_hand_button" android:id="@+id/lower_hand_button"

1
app/src/main/res/values/strings.xml
View File

@ -311,6 +311,7 @@ How to translate with transifex:
<string name="restrict_join_other_room_while_call">It\'s not possible to join other rooms while being in a call</string> <string name="restrict_join_other_room_while_call">It\'s not possible to join other rooms while being in a call</string>
<string name="call_running_since_one_hour">The call has been running for one hour.</string> <string name="call_running_since_one_hour">The call has been running for one hour.</string>
<string name="end_call_for_everyone">End call for everyone</string> <string name="end_call_for_everyone">End call for everyone</string>
<string name="leave_call">Leave call</string>
<!-- Picture in Picture --> <!-- Picture in Picture -->
<string name="nc_pip_microphone_mute">Mute microphone</string> <string name="nc_pip_microphone_mute">Mute microphone</string>