1
0
mirror of https://github.com/nextcloud/talk-android synced 2025-07-09 13:59:48 +01:00

ktlintFormat

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-10-25 20:14:01 +02:00 committed by Marcel Hibbe
parent bf3ed0ed42
commit be9bda7f04
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
4 changed files with 20 additions and 23 deletions
app/src/main
java/com/nextcloud/talk
res/values

View File

@ -621,7 +621,11 @@ class CallActivity : CallBaseActivity() {
} }
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
private fun initClickListeners(isModerator:Boolean, isOneToOneConversation:Boolean, isGroupConversation:Boolean) { private fun initClickListeners(
isModerator: Boolean,
isOneToOneConversation: Boolean,
isGroupConversation: Boolean
) {
binding!!.pictureInPictureButton.setOnClickListener { enterPipMode() } binding!!.pictureInPictureButton.setOnClickListener { enterPipMode() }
binding!!.audioOutputButton.setOnClickListener { binding!!.audioOutputButton.setOnClickListener {
@ -698,7 +702,6 @@ class CallActivity : CallBaseActivity() {
} }
} }
binding!!.popupMenu.setOnClickListener { binding!!.popupMenu.setOnClickListener {
hangup(true, true) hangup(true, true)
binding!!.popupMenu.visibility = View.GONE binding!!.popupMenu.visibility = View.GONE
@ -741,7 +744,6 @@ class CallActivity : CallBaseActivity() {
private fun showPopupMenu() { private fun showPopupMenu() {
binding!!.popupMenu.visibility = View.VISIBLE binding!!.popupMenu.visibility = View.VISIBLE
} }
private fun createCameraEnumerator() { private fun createCameraEnumerator() {
@ -1377,11 +1379,8 @@ class CallActivity : CallBaseActivity() {
} }
override fun dispatchTouchEvent(event: MotionEvent): Boolean { override fun dispatchTouchEvent(event: MotionEvent): Boolean {
if (binding!!.popupMenu.visibility == View.VISIBLE) { if (binding!!.popupMenu.visibility == View.VISIBLE) {
if (event.action == MotionEvent.ACTION_DOWN) { if (event.action == MotionEvent.ACTION_DOWN) {
val buttonLocation = IntArray(2) val buttonLocation = IntArray(2)
binding!!.popupMenu.getLocationOnScreen(buttonLocation) binding!!.popupMenu.getLocationOnScreen(buttonLocation)
@ -1403,7 +1402,6 @@ class CallActivity : CallBaseActivity() {
return super.dispatchTouchEvent(event) return super.dispatchTouchEvent(event)
} }
fun clickRaiseOrLowerHandButton() { fun clickRaiseOrLowerHandButton() {
raiseHandViewModel!!.clickHandButton() raiseHandViewModel!!.clickHandButton()
} }

View File

@ -67,5 +67,4 @@ object ConversationUtils {
return currentConversation != null && return currentConversation != null &&
currentConversation.type == ConversationEnums.ConversationType.NOTE_TO_SELF currentConversation.type == ConversationEnums.ConversationType.NOTE_TO_SELF
} }
} }

View File

@ -310,7 +310,7 @@ How to translate with transifex:
<string name="lower_hand">Lower hand</string> <string name="lower_hand">Lower hand</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="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>
<!-- Picture in Picture --> <!-- Picture in Picture -->
<string name="nc_pip_microphone_mute">Mute microphone</string> <string name="nc_pip_microphone_mute">Mute microphone</string>