desktop: bound long click to right click too (#2783)

* desktop: bound long click to right click too

* changes

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/helpers/DefaultDropDownMenu.android.kt

@@ -8,6 +8,8 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.PopupProperties
 
+actual fun Modifier.onRightClick(action: () -> Unit): Modifier = this
+
 actual interface DefaultExposedDropdownMenuBoxScope {
   @Composable
   actual fun DefaultExposedDropdownMenu(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatItemInfoView.kt

@@ -70,6 +70,7 @@ fun ChatItemInfoView(ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
       Box(
         Modifier.clip(RoundedCornerShape(18.dp)).background(itemColor).padding(bottom = 3.dp)
           .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
+          .onRightClick { showMenu.value = true }
       ) {
         Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
           TextBubble(text, ciVersion.formattedText, sender = null, showMenu)
@@ -116,6 +117,7 @@ fun ChatItemInfoView(ci: ChatItem, ciInfo: ChatItemInfo, devTools: Boolean) {
       Box(
         Modifier.clip(RoundedCornerShape(18.dp)).background(quoteColor).padding(bottom = 3.dp)
           .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
+          .onRightClick { showMenu.value = true }
       ) {
         Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
           TextBubble(text, qi.formattedText, sender = qi.sender(null), showMenu)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SendMsgView.kt

@@ -450,7 +450,8 @@ private fun SendMsgButton(
         role = Role.Button,
         interactionSource = interactionSource,
         indication = rememberRipple(bounded = false, radius = 24.dp)
-      ),
+      )
+      .onRightClick { onLongClick?.invoke() },
     contentAlignment = Alignment.Center
   ) {
     Icon(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIImageView.kt

@@ -1,7 +1,6 @@
 package chat.simplex.common.views.chat.item
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Icon
@@ -101,7 +100,8 @@ fun CIImageView(
         .combinedClickable(
           onLongClick = { showMenu.value = true },
           onClick = onClick
-        ),
+        )
+        .onRightClick { showMenu.value = true },
       contentScale = ContentScale.FillWidth,
     )
   }
@@ -118,7 +118,8 @@ fun CIImageView(
         .combinedClickable(
           onLongClick = { showMenu.value = true },
           onClick = onClick
-        ),
+        )
+        .onRightClick { showMenu.value = true },
       contentScale = ContentScale.FillWidth,
     )
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVIdeoView.kt

@@ -142,7 +142,8 @@ private fun BoxScope.PlayButton(error: Boolean = false, onLongClick: () -> Unit,
     Box(
       Modifier
         .defaultMinSize(minWidth = 40.dp, minHeight = 40.dp)
-        .combinedClickable(onClick = onClick, onLongClick = onLongClick),
+        .combinedClickable(onClick = onClick, onLongClick = onLongClick)
+        .onRightClick { onLongClick.invoke() },
       contentAlignment = Alignment.Center
     ) {
       Icon(
@@ -211,7 +212,8 @@ private fun ImageView(preview: ImageBitmap, showMenu: MutableState<Boolean>, onC
       .combinedClickable(
         onLongClick = { showMenu.value = true },
         onClick = onClick
-      ),
+      )
+      .onRightClick { showMenu.value = true },
     contentScale = ContentScale.FillWidth,
   )
 }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVoiceView.kt

@@ -222,7 +222,8 @@ private fun PlayPauseButton(
         .combinedClickable(
           onClick = { if (!audioPlaying) play() else pause() },
           onLongClick = longClick
-        ),
+        )
+        .onRightClick { longClick() },
       contentAlignment = Alignment.Center
     ) {
       Icon(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -111,7 +111,8 @@ fun ChatItemView(
       Column(
         Modifier
           .clip(RoundedCornerShape(18.dp))
-          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick),
+          .combinedClickable(onLongClick = { showMenu.value = true }, onClick = onClick)
+          .onRightClick { showMenu.value = true },
       ) {
         @Composable
         fun framedItemView() {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt

@@ -10,7 +10,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.*
 import androidx.compose.ui.platform.UriHandler
@@ -23,10 +22,8 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.model.*
 import chat.simplex.common.platform.base64ToBitmap
 import chat.simplex.res.MR
-import kotlinx.datetime.Clock
 import kotlin.math.min
 
 @Composable
@@ -110,6 +107,7 @@ fun FramedItemView(
           onLongClick = { showMenu.value = true },
           onClick = { scrollToItem(qi.itemId?: return@combinedClickable) }
         )
+        .onRightClick { showMenu.value = true }
     ) {
       when (qi.content) {
         is MsgContent.MCImage -> {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt

@@ -24,7 +24,6 @@ import chat.simplex.common.views.chat.item.InvalidJSONView
 import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.ContactConnectionInfoView
-import chat.simplex.common.model.*
 import chat.simplex.common.platform.appPlatform
 import chat.simplex.common.platform.ntfManager
 import chat.simplex.res.MR
@@ -619,7 +618,9 @@ fun ChatListNavLinkLayout(
   stopped: Boolean
 ) {
   var modifier = Modifier.fillMaxWidth()
-  if (!stopped) modifier = modifier.combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
+  if (!stopped) modifier = modifier
+    .combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
+    .onRightClick { showMenu.value = true }
   Box(modifier) {
     Row(
       modifier = Modifier

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/UserPicker.kt

@@ -165,6 +165,7 @@ fun UserProfilePickerItem(u: User, unreadCount: Int = 0, padding: PaddingValues
         interactionSource = remember { MutableInteractionSource() },
         indication = if (!u.activeUser) LocalIndication.current else null
       )
+      .onRightClick { onLongClick() }
       .padding(padding),
     horizontalArrangement = Arrangement.SpaceBetween,
     verticalAlignment = Alignment.CenterVertically

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultDropdownMenu.kt

@@ -11,6 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 
+expect fun Modifier.onRightClick(action: () -> Unit): Modifier
+
 expect interface DefaultExposedDropdownMenuBoxScope {
   @Composable
   open fun DefaultExposedDropdownMenu(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt

@@ -1,5 +1,4 @@
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
@@ -15,8 +14,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.platform.screenWidth
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.helpers.ValueTitleDesc
-import chat.simplex.common.views.helpers.ValueTitle
+import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.usersettings.SettingsActionItemWithContent
 import chat.simplex.res.MR
 
@@ -132,7 +130,9 @@ fun SectionItemViewSpaceBetween(
     .fillMaxWidth()
     .sizeIn(minHeight = minHeight)
   Row(
-    if (click == null || disabled) modifier.padding(padding) else modifier.combinedClickable(onClick = click, onLongClick = onLongClick).padding(padding),
+    if (click == null || disabled) modifier.padding(padding) else modifier
+      .combinedClickable(onClick = click, onLongClick = onLongClick).padding(padding)
+      .onRightClick { onLongClick?.invoke() },
     horizontalArrangement = Arrangement.SpaceBetween,
     verticalAlignment = Alignment.CenterVertically
   ) {

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/helpers/DefaultDropDownMenu.desktop.kt

@@ -1,6 +1,6 @@
 package chat.simplex.common.views.helpers
 
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.DropdownMenu
@@ -9,7 +9,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import kotlin.math.exp
+
+actual fun Modifier.onRightClick(action: () -> Unit): Modifier = contextMenuOpenDetector { action() }
 
 actual interface DefaultExposedDropdownMenuBoxScope {
   @Composable