Релиз 1.3.4: sticky-плашка звонка и поиск сообщений в диалоге

app/src/main/java/com/rosetta/messenger/MainActivity.kt

@@ -9,6 +9,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
@@ -38,6 +39,7 @@ import com.rosetta.messenger.data.RecentSearchesManager
 import com.rosetta.messenger.data.resolveAccountDisplayName
 import com.rosetta.messenger.database.RosettaDatabase
 import com.rosetta.messenger.network.CallActionResult
+import com.rosetta.messenger.network.CallPhase
 import com.rosetta.messenger.network.CallManager
 import com.rosetta.messenger.network.ProtocolManager
 import com.rosetta.messenger.network.ProtocolState
@@ -594,6 +596,7 @@ fun MainScreen(
     val rootView = LocalView.current
     val callScope = rememberCoroutineScope()
     val callUiState by CallManager.state.collectAsState()
+    var isCallOverlayExpanded by remember { mutableStateOf(true) }
     var pendingOutgoingCall by remember { mutableStateOf<SearchUser?>(null) }
     var pendingIncomingAccept by remember { mutableStateOf(false) }
     var callPermissionsRequestedOnce by remember { mutableStateOf(false) }
@@ -763,6 +766,14 @@ fun MainScreen(
         CallManager.bindAccount(accountPublicKey)
     }
 
+    LaunchedEffect(callUiState.isVisible) {
+        if (callUiState.isVisible) {
+            isCallOverlayExpanded = true
+        } else {
+            isCallOverlayExpanded = false
+        }
+    }
+
     LaunchedEffect(callUiState.isVisible) {
         if (callUiState.isVisible) {
             focusManager.clearFocus(force = true)
@@ -776,6 +787,15 @@ fun MainScreen(
         }
     }
 
+    // Telegram-style behavior: while call screen is open, Back should minimize call to top banner.
+    BackHandler(
+        enabled = callUiState.isVisible &&
+            isCallOverlayExpanded &&
+            callUiState.phase != CallPhase.INCOMING
+    ) {
+        isCallOverlayExpanded = false
+    }
+
     LaunchedEffect(accountPublicKey, reloadTrigger) {
         if (accountPublicKey.isNotBlank()) {
             val accountManager = AccountManager(context)
@@ -1044,6 +1064,9 @@ fun MainScreen(
                     },
                     chatsViewModel = chatsListViewModel,
                     avatarRepository = avatarRepository,
+                    callUiState = callUiState,
+                    isCallOverlayExpanded = isCallOverlayExpanded,
+                    onOpenCallOverlay = { isCallOverlayExpanded = true },
                     onAddAccount = {
                         onAddAccount()
                     },
@@ -1578,14 +1601,20 @@ fun MainScreen(
         }
 
         CallOverlay(
-                state = callUiState,
-                isDarkTheme = isDarkTheme,
-                avatarRepository = avatarRepository,
-                onAccept = { acceptCallWithPermission() },
-                onDecline = { CallManager.declineIncomingCall() },
-                onEnd = { CallManager.endCall() },
-                onToggleMute = { CallManager.toggleMute() },
-                onToggleSpeaker = { CallManager.toggleSpeaker() }
+            state = callUiState,
+            isDarkTheme = isDarkTheme,
+            avatarRepository = avatarRepository,
+            isExpanded = isCallOverlayExpanded || callUiState.phase == CallPhase.INCOMING,
+            onAccept = { acceptCallWithPermission() },
+            onDecline = { CallManager.declineIncomingCall() },
+            onEnd = { CallManager.endCall() },
+            onToggleMute = { CallManager.toggleMute() },
+            onToggleSpeaker = { CallManager.toggleSpeaker() },
+            onMinimize = {
+                if (callUiState.phase != CallPhase.INCOMING) {
+                    isCallOverlayExpanded = false
+                }
+            }
         )
     }
 }