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

use white background for popup button and formatting

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-11-08 16:03:40 +01:00 committed by Marcel Hibbe
parent eda9b94182
commit 121e77b753
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,19 +689,18 @@ class CallActivity : CallBaseActivity() {
} }
} }
if(!isOneToOneConversation){ if (!isOneToOneConversation) {
binding!!.popupMenu.setOnClickListener { binding!!.popupMenu.setOnClickListener {
hangup(true, true) hangup(true, true)
binding!!.popupMenu.visibility = View.GONE binding!!.popupMenu.visibility = View.GONE
} }
}else{ } else {
binding!!.popupMenu.setOnClickListener { binding!!.popupMenu.setOnClickListener {
hangup(true,false) hangup(true, false)
binding!!.popupMenu.visibility =View.GONE 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 ->
@ -742,10 +741,9 @@ class CallActivity : CallBaseActivity() {
binding!!.popupMenu.text = context.getString(R.string.end_call_for_everyone) binding!!.popupMenu.text = context.getString(R.string.end_call_for_everyone)
} }
private fun showLeavePopupMenu(){ private fun showLeavePopupMenu() {
binding!!.popupMenu.visibility = View.VISIBLE binding!!.popupMenu.visibility = View.VISIBLE
binding!!.popupMenu.text = context.getString(R.string.leave_call) binding!!.popupMenu.text = context.getString(R.string.leave_call)
} }
private fun createCameraEnumerator() { private fun createCameraEnumerator() {
@ -2079,7 +2077,7 @@ class CallActivity : CallBaseActivity() {
callParticipantList!!.removeObserver(callParticipantListObserver) callParticipantList!!.removeObserver(callParticipantListObserver)
callParticipantList!!.destroy() callParticipantList!!.destroy()
} }
val endCall: Boolean? = if(endCallForAll) true else null val endCall: Boolean? = if (endCallForAll) true else null
ncApi!!.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken!!), endCall) ncApi!!.leaveCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken!!), endCall)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())

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

@ -202,7 +202,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible"
android:backgroundTint="@android:color/darker_gray" android:backgroundTint="@android:color/white"
android:textColor="@android:color/holo_red_light" android:textColor="@android:color/holo_red_light"
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"