From f10b51a145d49b636186cbfd57ca03f5ac27abb7 Mon Sep 17 00:00:00 2001
From: gabriel20xx <gabrielfranz31@gmail.com>
Date: Wed, 29 Oct 2025 16:33:51 +0100
Subject: [PATCH] feat: restructure Leave Server section with improved layout
 and visual hierarchy

---
 .../app/ui/screens/SettingsScreen.kt          | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/SettingsScreen.kt b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/SettingsScreen.kt
index 378250f..6a35900 100644
--- a/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/SettingsScreen.kt
+++ b/CollabTableAndroid/app/src/main/java/com/collabtable/app/ui/screens/SettingsScreen.kt
@@ -307,27 +307,41 @@ fun SettingsScreen(
                 }
             }
 
-            // Leave Server button relocated below Diagnostics section
-            Button(
-                onClick = { showLeaveDialog = true },
+            // Leave Server section
+            Text(
+                text = "Leave Server",
+                style = MaterialTheme.typography.titleMedium,
+            )
+            Card(
                 modifier = Modifier.fillMaxWidth(),
-                enabled = !isLeaving,
-                colors =
-                    ButtonDefaults.buttonColors(
-                        containerColor = MaterialTheme.colorScheme.error,
-                        contentColor = MaterialTheme.colorScheme.onError,
-                    ),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
             ) {
-                if (isLeaving) {
-                    CircularProgressIndicator(
-                        modifier = Modifier.size(16.dp),
-                        color = MaterialTheme.colorScheme.onError,
-                        strokeWidth = 2.dp,
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text("Leaving...")
-                } else {
-                    Text("Leave Server")
+                Column(
+                    modifier = Modifier.padding(12.dp),
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Button(
+                        onClick = { showLeaveDialog = true },
+                        modifier = Modifier.fillMaxWidth(),
+                        enabled = !isLeaving,
+                        colors =
+                            ButtonDefaults.buttonColors(
+                                containerColor = MaterialTheme.colorScheme.error,
+                                contentColor = MaterialTheme.colorScheme.onError,
+                            ),
+                    ) {
+                        if (isLeaving) {
+                            CircularProgressIndicator(
+                                modifier = Modifier.size(16.dp),
+                                color = MaterialTheme.colorScheme.onError,
+                                strokeWidth = 2.dp,
+                            )
+                            Spacer(modifier = Modifier.width(8.dp))
+                            Text("Leaving...")
+                        } else {
+                            Text("Leave Server")
+                        }
+                    }
                 }
             }