Merge pull request #2604 from switchifyapp/feature/pc-control-right-close-button-2603

Move PC Control close button to right side

Author: enaboapps

app/src/main/java/com/enaboapps/switchify/screens/pc/PcControlSurfaceSwitcher.kt

@@ -9,8 +9,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Keyboard
 import androidx.compose.material.icons.filled.TouchApp
 import androidx.compose.material.icons.rounded.Computer
@@ -31,6 +33,7 @@ fun PcControlSurfaceSwitcher(
     selectedSurface: PcControlSurface,
     onSurfaceSelected: (PcControlSurface) -> Unit,
     enabled: Boolean = true,
+    onClose: (() -> Unit)? = null,
     modifier: Modifier = Modifier
 ) {
     Surface(
@@ -88,6 +91,35 @@ fun PcControlSurfaceSwitcher(
                     }
                 }
             }
+            onClose?.let { close ->
+                val contentColor = if (enabled) {
+                    MaterialTheme.colorScheme.onSurface
+                } else {
+                    MaterialTheme.colorScheme.onSurfaceVariant
+                }
+                Box(
+                    modifier = Modifier
+                        .width(56.dp)
+                        .heightIn(min = 48.dp)
+                        .padding(4.dp)
+                ) {
+                    IconButton(
+                        onClick = close,
+                        enabled = enabled,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(40.dp)
+                            .semantics { contentDescription = "Close PC controls" }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Close,
+                            contentDescription = null,
+                            modifier = Modifier.size(22.dp),
+                            tint = contentColor
+                        )
+                    }
+                }
+            }
         }
     }
 }

app/src/main/java/com/enaboapps/switchify/screens/pc/PcMouseControlActivity.kt

@@ -104,17 +104,12 @@ private fun PcMouseControlScreen(
                             selectedSurface = uiState.activeSurface,
                             onSurfaceSelected = viewModel::selectControlSurface,
                             enabled = !uiState.isBusy,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(start = 22.dp)
-                        )
-                        PcConnectionStatusDot(
-                            connectedDisplayName = uiState.connectedDisplayName
+                            onClose = onClose,
+                            modifier = Modifier.fillMaxWidth()
                         )
                     }
                 },
-                showBackButton = true,
-                onBackPressed = onClose
+                showBackButton = false
             )
         },
         bottomBar = {