android: align top bar offsets across main pages

android/CHANGELOG.md

@@ -499,3 +499,9 @@
 - Added top app bars for all 4 main pages (`Chats`, `Contacts`, `Settings`, `Profile`) to make them feel like proper standalone sections.
 - Moved chats management toggle action into chats app bar.
 - Kept safe-area handling and bottom insets consistent with shared floating tabs bar to avoid overlap.
+
+### Step 80 - Top bar offset consistency fix
+- Unified top bar alignment across `Chats`, `Contacts`, `Settings`, and `Profile`:
+  - removed extra outer paddings that shifted headers down/right on some pages,
+  - separated content padding from top app bar container.
+- Result: consistent title baseline and horizontal alignment between main pages.

android/app/src/main/java/ru/daemonlord/messenger/ui/contacts/ContactsScreen.kt

@@ -87,35 +87,42 @@ private fun ContactsScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .then(if (isTabletLayout) Modifier.widthIn(max = 820.dp) else Modifier)
-                .padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 96.dp),
+                .padding(bottom = 96.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
         ) {
             TopAppBar(
                 title = { Text("Contacts") },
             )
-            OutlinedTextField(
+            Column(
-                value = query,
+                modifier = Modifier
-                onValueChange = { query = it },
+                    .fillMaxSize()
-                modifier = Modifier.fillMaxWidth(),
+                    .padding(horizontal = 16.dp),
-                singleLine = true,
+                verticalArrangement = Arrangement.spacedBy(12.dp),
-                label = { Text("Search contacts") },
-            )
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                state = listState,
-                verticalArrangement = Arrangement.spacedBy(10.dp),
             ) {
-                items(filtered) { name ->
+                OutlinedTextField(
-                    Column(
+                    value = query,
-                        modifier = Modifier.fillMaxWidth(),
+                    onValueChange = { query = it },
-                        verticalArrangement = Arrangement.spacedBy(2.dp),
+                    modifier = Modifier.fillMaxWidth(),
-                    ) {
+                    singleLine = true,
-                        Text(text = name, fontWeight = FontWeight.SemiBold)
+                    label = { Text("Search contacts") },
-                        Text(
+                )
-                            text = "last seen recently",
+                LazyColumn(
-                            style = MaterialTheme.typography.bodySmall,
+                    modifier = Modifier.fillMaxSize(),
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    state = listState,
-                        )
+                    verticalArrangement = Arrangement.spacedBy(10.dp),
+                ) {
+                    items(filtered) { name ->
+                        Column(
+                            modifier = Modifier.fillMaxWidth(),
+                            verticalArrangement = Arrangement.spacedBy(2.dp),
+                        ) {
+                            Text(text = name, fontWeight = FontWeight.SemiBold)
+                            Text(
+                                text = "last seen recently",
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                        }
                     }
                 }
             }

android/app/src/main/java/ru/daemonlord/messenger/ui/profile/ProfileScreen.kt

@@ -127,13 +127,19 @@ fun ProfileScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .then(if (isTabletLayout) Modifier.widthIn(max = 720.dp) else Modifier)
-                .verticalScroll(scrollState)
+                .padding(bottom = 96.dp),
-                .padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 96.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
         ) {
         TopAppBar(
             title = { Text("Profile") },
         )
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .verticalScroll(scrollState)
+                .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
         if (!avatarUrl.isBlank()) {
             Box(
                 modifier = Modifier.fillMaxWidth(),
@@ -230,6 +236,7 @@ fun ProfileScreen(
             Text("Back to chats")
         }
         }
+        }
     }
 }
 

android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt

@@ -107,13 +107,19 @@ fun SettingsScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .then(if (isTabletLayout) Modifier.widthIn(max = 720.dp) else Modifier)
-                .verticalScroll(scrollState)
+                .padding(bottom = 96.dp),
-                .padding(start = 16.dp, top = 16.dp, end = 16.dp, bottom = 96.dp),
             verticalArrangement = Arrangement.spacedBy(12.dp),
         ) {
-        TopAppBar(
+            TopAppBar(
-            title = { Text("Settings") },
+                title = { Text("Settings") },
-        )
+            )
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .verticalScroll(scrollState)
+                    .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
         Text("Appearance", style = MaterialTheme.typography.titleMedium)
         Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
             OutlinedButton(
@@ -340,6 +346,7 @@ fun SettingsScreen(
                 Text("Back to chats")
             }
         }
+            }
         }
     }
 }