Merge branch 'stable'

2026-03-30 18:35:49 +00:00 · 2025-01-04 18:40:57 +00:00
parent aa7095dee2 2793692a16
commit 651c5640e2
4 changed files with 148 additions and 151 deletions
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
@@ -99,7 +99,8 @@ class CallActivity: ComponentActivity(), ServiceConnection {
  fun setPipParams(video: Boolean, sourceRectHint: Rect? = null, viewRatio: Rational? = null) {
    // By manually specifying source rect we exclude empty background while toggling PiP
    val builder = PictureInPictureParams.Builder()
-        .setAspectRatio(viewRatio)
+      // that's limitation of Android. Otherwise, may crash on devices like Z Fold 3
+        .setAspectRatio(viewRatio?.coerceIn(Rational(100, 239)..Rational(239, 100)))
        .setSourceRectHint(sourceRectHint)
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
      builder.setAutoEnterEnabled(video)
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/TerminalView.kt
@@ -88,7 +88,7 @@ fun TerminalLayout(
          .background(MaterialTheme.colors.background)
      ) {
        Divider()
-        Box(Modifier.padding(horizontal = 8.dp)) {
+        Surface(Modifier.padding(horizontal = 8.dp), color = MaterialTheme.colors.background, contentColor = MaterialTheme.colors.onBackground) {
          SendMsgView(
            composeState = composeState,
            showVoiceRecordIcon = false,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -918,154 +918,153 @@ fun ComposeView(
        }
      }
    }
-    Box(Modifier.background(MaterialTheme.colors.background)) {
-    Divider()
-    Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
-      val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
-      val attachmentClicked = if (isGroupAndProhibitedFiles) {
-        {
-          AlertManager.shared.showAlertMsg(
-            title = generalGetString(MR.strings.files_and_media_prohibited),
-            text = generalGetString(MR.strings.only_owners_can_enable_files_and_media)
+    Surface(color = MaterialTheme.colors.background, contentColor = MaterialTheme.colors.onBackground) {
+      Divider()
+      Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
+        val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
+        val attachmentClicked = if (isGroupAndProhibitedFiles) {
+          {
+            AlertManager.shared.showAlertMsg(
+              title = generalGetString(MR.strings.files_and_media_prohibited),
+              text = generalGetString(MR.strings.only_owners_can_enable_files_and_media)
+            )
+          }
+        } else {
+          showChooseAttachment
+        }
+        val attachmentEnabled =
+          !composeState.value.attachmentDisabled
+              && sendMsgEnabled.value
+              && userCanSend.value
+              && !isGroupAndProhibitedFiles
+              && !nextSendGrpInv.value
+        IconButton(
+          attachmentClicked,
+          Modifier.padding(start = 3.dp, end = 1.dp, bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
+          enabled = attachmentEnabled
+        ) {
+          Icon(
+            painterResource(MR.images.ic_attach_file_filled_500),
+            contentDescription = stringResource(MR.strings.attach),
+            tint = if (attachmentEnabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
+            modifier = Modifier
+              .size(28.dp)
+              .clip(CircleShape)
          )
        }
-      } else {
-        showChooseAttachment
-      }
-      val attachmentEnabled =
-        !composeState.value.attachmentDisabled
-            && sendMsgEnabled.value
-            && userCanSend.value
-            && !isGroupAndProhibitedFiles
-            && !nextSendGrpInv.value
-      IconButton(
-        attachmentClicked,
-        Modifier.padding(start = 3.dp, end = 1.dp, bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
-        enabled = attachmentEnabled
-      ) {
-        Icon(
-          painterResource(MR.images.ic_attach_file_filled_500),
-          contentDescription = stringResource(MR.strings.attach),
-          tint = if (attachmentEnabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-          modifier = Modifier
-            .size(28.dp)
-            .clip(CircleShape)
+        val allowedVoiceByPrefs = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.Voice) }
+        LaunchedEffect(allowedVoiceByPrefs) {
+          if (!allowedVoiceByPrefs && composeState.value.preview is ComposePreview.VoicePreview) {
+            // Voice was disabled right when this user records it, just cancel it
+            cancelVoice()
+          }
+        }
+        val needToAllowVoiceToContact = remember(chat.chatInfo) {
+          chat.chatInfo is ChatInfo.Direct && with(chat.chatInfo.contact.mergedPreferences.voice) {
+            ((userPreference as? ContactUserPref.User)?.preference?.allow == FeatureAllowed.NO || (userPreference as? ContactUserPref.Contact)?.preference?.allow == FeatureAllowed.NO) &&
+                contactPreference.allow == FeatureAllowed.YES
+          }
+        }
+        LaunchedEffect(Unit) {
+          snapshotFlow { recState.value }
+            .distinctUntilChanged()
+            .collect {
+              when (it) {
+                is RecordingState.Started -> onAudioAdded(it.filePath, it.progressMs, false)
+                is RecordingState.Finished -> if (it.durationMs > 300) {
+                  onAudioAdded(it.filePath, it.durationMs, true)
+                } else {
+                  cancelVoice()
+                }
+                is RecordingState.NotStarted -> {}
+              }
+            }
+        }
+
+        LaunchedEffect(rememberUpdatedState(chat.chatInfo.userCanSend).value) {
+          if (!chat.chatInfo.userCanSend) {
+            clearCurrentDraft()
+            clearState()
+          }
+        }
+
+        KeyChangeEffect(chatModel.chatId.value) { prevChatId ->
+          val cs = composeState.value
+          if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
+            sendMessage(null)
+            resetLinkPreview()
+            clearPrevDraft(prevChatId)
+            deleteUnusedFiles()
+          } else if (cs.inProgress) {
+            clearPrevDraft(prevChatId)
+          } else if (!cs.empty) {
+            if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
+              composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
+            }
+            if (saveLastDraft) {
+              chatModel.draft.value = composeState.value
+              chatModel.draftChatId.value = prevChatId
+            }
+            composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
+          } else if (chatModel.draftChatId.value == chatModel.chatId.value && chatModel.draft.value != null) {
+            composeState.value = chatModel.draft.value ?: ComposeState(useLinkPreviews = useLinkPreviews)
+          } else {
+            clearPrevDraft(prevChatId)
+            deleteUnusedFiles()
+          }
+          chatModel.removeLiveDummy()
+          CIFile.cachedRemoteFileRequests.clear()
+        }
+        if (appPlatform.isDesktop) {
+          // Don't enable this on Android, it breaks it, This method only works on desktop. For Android there is a `KeyChangeEffect(chatModel.chatId.value)`
+          DisposableEffect(Unit) {
+            onDispose {
+              if (chatModel.sharedContent.value is SharedContent.Forward && saveLastDraft && !composeState.value.empty) {
+                chatModel.draft.value = composeState.value
+                chatModel.draftChatId.value = chat.id
+              }
+            }
+          }
+        }
+        val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
+        val sendButtonColor =
+          if (chat.chatInfo.incognito)
+            if (isInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
+          else MaterialTheme.colors.primary
+        SendMsgView(
+          composeState,
+          showVoiceRecordIcon = true,
+          recState,
+          chat.chatInfo is ChatInfo.Direct,
+          liveMessageAlertShown = chatModel.controller.appPrefs.liveMessageAlertShown,
+          sendMsgEnabled = sendMsgEnabled.value,
+          sendButtonEnabled = sendMsgEnabled.value && !(simplexLinkProhibited || fileProhibited || voiceProhibited),
+          nextSendGrpInv = nextSendGrpInv.value,
+          needToAllowVoiceToContact,
+          allowedVoiceByPrefs,
+          allowVoiceToContact = ::allowVoiceToContact,
+          userIsObserver = userIsObserver.value,
+          userCanSend = userCanSend.value,
+          sendButtonColor = sendButtonColor,
+          timedMessageAllowed = timedMessageAllowed,
+          customDisappearingMessageTimePref = chatModel.controller.appPrefs.customDisappearingMessageTime,
+          placeholder = stringResource(MR.strings.compose_message_placeholder),
+          sendMessage = { ttl ->
+            sendMessage(ttl)
+            resetLinkPreview()
+          },
+          sendLiveMessage = if (chat.chatInfo.chatType != ChatType.Local) ::sendLiveMessage else null,
+          updateLiveMessage = ::updateLiveMessage,
+          cancelLiveMessage = {
+            composeState.value = composeState.value.copy(liveMessage = null)
+            chatModel.removeLiveDummy()
+          },
+          editPrevMessage = ::editPrevMessage,
+          onFilesPasted = { composeState.onFilesAttached(it) },
+          onMessageChange = ::onMessageChange,
+          textStyle = textStyle
        )
      }
-      val allowedVoiceByPrefs = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.Voice) }
-      LaunchedEffect(allowedVoiceByPrefs) {
-        if (!allowedVoiceByPrefs && composeState.value.preview is ComposePreview.VoicePreview) {
-          // Voice was disabled right when this user records it, just cancel it
-          cancelVoice()
-        }
-      }
-      val needToAllowVoiceToContact = remember(chat.chatInfo) {
-        chat.chatInfo is ChatInfo.Direct && with(chat.chatInfo.contact.mergedPreferences.voice) {
-          ((userPreference as? ContactUserPref.User)?.preference?.allow == FeatureAllowed.NO || (userPreference as? ContactUserPref.Contact)?.preference?.allow == FeatureAllowed.NO) &&
-              contactPreference.allow == FeatureAllowed.YES
-        }
-      }
-      LaunchedEffect(Unit) {
-        snapshotFlow { recState.value }
-          .distinctUntilChanged()
-          .collect {
-            when (it) {
-              is RecordingState.Started -> onAudioAdded(it.filePath, it.progressMs, false)
-              is RecordingState.Finished -> if (it.durationMs > 300) {
-                onAudioAdded(it.filePath, it.durationMs, true)
-              } else {
-                cancelVoice()
-              }
-              is RecordingState.NotStarted -> {}
-            }
-          }
-      }
-
-      LaunchedEffect(rememberUpdatedState(chat.chatInfo.userCanSend).value) {
-        if (!chat.chatInfo.userCanSend) {
-          clearCurrentDraft()
-          clearState()
-        }
-      }
-
-      KeyChangeEffect(chatModel.chatId.value) { prevChatId ->
-        val cs = composeState.value
-        if (cs.liveMessage != null && (cs.message.isNotEmpty() || cs.liveMessage.sent)) {
-          sendMessage(null)
-          resetLinkPreview()
-          clearPrevDraft(prevChatId)
-          deleteUnusedFiles()
-        } else if (cs.inProgress) {
-          clearPrevDraft(prevChatId)
-        } else if (!cs.empty) {
-          if (cs.preview is ComposePreview.VoicePreview && !cs.preview.finished) {
-            composeState.value = cs.copy(preview = cs.preview.copy(finished = true))
-          }
-          if (saveLastDraft) {
-            chatModel.draft.value = composeState.value
-            chatModel.draftChatId.value = prevChatId
-          }
-          composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
-        } else if (chatModel.draftChatId.value == chatModel.chatId.value && chatModel.draft.value != null) {
-          composeState.value = chatModel.draft.value ?: ComposeState(useLinkPreviews = useLinkPreviews)
-        } else {
-          clearPrevDraft(prevChatId)
-          deleteUnusedFiles()
-        }
-        chatModel.removeLiveDummy()
-        CIFile.cachedRemoteFileRequests.clear()
-      }
-      if (appPlatform.isDesktop) {
-        // Don't enable this on Android, it breaks it, This method only works on desktop. For Android there is a `KeyChangeEffect(chatModel.chatId.value)`
-        DisposableEffect(Unit) {
-          onDispose {
-            if (chatModel.sharedContent.value is SharedContent.Forward && saveLastDraft && !composeState.value.empty) {
-              chatModel.draft.value = composeState.value
-              chatModel.draftChatId.value = chat.id
-            }
-          }
-        }
-      }
-
-      val timedMessageAllowed = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.TimedMessages) }
-      val sendButtonColor =
-        if (chat.chatInfo.incognito)
-          if (isInDarkTheme()) Indigo else Indigo.copy(alpha = 0.7F)
-        else MaterialTheme.colors.primary
-      SendMsgView(
-        composeState,
-        showVoiceRecordIcon = true,
-        recState,
-        chat.chatInfo is ChatInfo.Direct,
-        liveMessageAlertShown = chatModel.controller.appPrefs.liveMessageAlertShown,
-        sendMsgEnabled = sendMsgEnabled.value,
-        sendButtonEnabled = sendMsgEnabled.value && !(simplexLinkProhibited || fileProhibited || voiceProhibited),
-        nextSendGrpInv = nextSendGrpInv.value,
-        needToAllowVoiceToContact,
-        allowedVoiceByPrefs,
-        allowVoiceToContact = ::allowVoiceToContact,
-        userIsObserver = userIsObserver.value,
-        userCanSend = userCanSend.value,
-        sendButtonColor = sendButtonColor,
-        timedMessageAllowed = timedMessageAllowed,
-        customDisappearingMessageTimePref = chatModel.controller.appPrefs.customDisappearingMessageTime,
-        placeholder = stringResource(MR.strings.compose_message_placeholder),
-        sendMessage = { ttl ->
-          sendMessage(ttl)
-          resetLinkPreview()
-        },
-        sendLiveMessage = if (chat.chatInfo.chatType != ChatType.Local) ::sendLiveMessage else null,
-        updateLiveMessage = ::updateLiveMessage,
-        cancelLiveMessage = {
-          composeState.value = composeState.value.copy(liveMessage = null)
-          chatModel.removeLiveDummy()
-        },
-        editPrevMessage = ::editPrevMessage,
-        onFilesPasted = { composeState.onFilesAttached(it) },
-        onMessageChange = ::onMessageChange,
-        textStyle = textStyle
-      )
    }
  }
-  }
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt
@@ -297,7 +297,7 @@ private fun AlertContent(
  belowTextContent: @Composable (() -> Unit) = {},
  content: @Composable (() -> Unit)
 ) {
-  BoxWithConstraints {
+  BoxWithConstraints(Modifier.verticalScroll(rememberScrollState())) {
    Column(
      Modifier
        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
@@ -311,7 +311,6 @@ private fun AlertContent(
        if (text != null) {
          Column(Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
            .padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING)
-            .verticalScroll(rememberScrollState())
          ) {
            SelectionContainer {
              Text(
@@ -334,10 +333,9 @@ private fun AlertContent(

@Composable
 private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>?, extraPadding: Boolean = false, content: @Composable (() -> Unit)) {
-  BoxWithConstraints {
+  BoxWithConstraints(Modifier.verticalScroll(rememberScrollState())) {
    Column(
      Modifier
-        .verticalScroll(rememberScrollState())
        .padding(bottom = if (appPlatform.isDesktop) DEFAULT_PADDING else DEFAULT_PADDING_HALF)
    ) {
      if (appPlatform.isDesktop) {
@@ -349,7 +347,6 @@ private fun AlertContent(text: AnnotatedString?, hostDevice: Pair<Long?, String>
        if (text != null) {
          Column(
            Modifier.heightIn(max = this@BoxWithConstraints.maxHeight * 0.7f)
-              .verticalScroll(rememberScrollState())
          ) {
            SelectionContainer {
              Text(