AI:remove more boilerplate

app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateScreen.kt

@@ -14,10 +14,8 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.CalendarMonth
 import androidx.compose.material.icons.filled.Schedule
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExposedDropdownMenuBox
@@ -27,11 +25,8 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -46,6 +41,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.trisolarispms.data.api.model.BookingBillingMode
+import com.android.trisolarispms.ui.common.SaveTopBarScaffold
 import java.time.LocalDate
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
@@ -94,23 +90,10 @@ fun BookingCreateScreen(
         viewModel.onExpectedCheckOutAtChange(formatBookingIso(defaultCheckoutDate, checkOutTime.value))
     }
 
-    Scaffold(
+    SaveTopBarScaffold(
-        topBar = {
+        title = "Create Booking",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Create Booking") },
+        onSave = { viewModel.submit(propertyId, onCreated) }
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                actions = {
-                    IconButton(onClick = { viewModel.submit(propertyId, onCreated) }) {
-                        Icon(Icons.Default.Done, contentDescription = "Save")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        }
     ) { padding ->
         Column(
             modifier = Modifier

app/src/main/java/com/android/trisolarispms/ui/booking/BookingExpectedDatesScreen.kt

@@ -3,24 +3,16 @@ package com.android.trisolarispms.ui.booking
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.CalendarMonth
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
@@ -30,6 +22,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.BookingExpectedDatesRequest
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
+import com.android.trisolarispms.ui.common.SaveTopBarScaffold
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 import java.time.OffsetDateTime
@@ -37,7 +31,6 @@ import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun BookingExpectedDatesScreen(
     propertyId: String,
     bookingId: String,
@@ -84,18 +77,11 @@ fun BookingExpectedDatesScreen(
         }
     }
 
-    Scaffold(
+    SaveTopBarScaffold(
-        topBar = {
+        title = "Update Expected Dates",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Update Expected Dates") },
+        saveEnabled = !isLoading.value,
-                navigationIcon = {
+        onSave = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                actions = {
-                    IconButton(
-                        onClick = {
             isLoading.value = true
             error.value = null
             val inAt = if (editableCheckIn) {
@@ -126,23 +112,9 @@ fun BookingExpectedDatesScreen(
                     isLoading.value = false
                 }
             }
-                        },
-                        enabled = !isLoading.value
-                    ) {
-                        Icon(Icons.Default.Done, contentDescription = "Save")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             if (editableCheckIn) {
                 OutlinedTextField(
                     value = checkInDate.value?.let {

app/src/main/java/com/android/trisolarispms/ui/guest/GuestInfoScreen.kt

@@ -3,23 +3,12 @@ package com.android.trisolarispms.ui.guest
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -27,9 +16,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
+import com.android.trisolarispms.ui.common.SaveTopBarScaffold
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun GuestInfoScreen(
     propertyId: String,
     guestId: String,
@@ -47,31 +37,12 @@ fun GuestInfoScreen(
         viewModel.loadGuest(propertyId, guestId, initialPhone)
     }
 
-    Scaffold(
+    SaveTopBarScaffold(
-        topBar = {
+        title = "Guest Info",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Guest Info") },
+        onSave = { viewModel.submit(propertyId, guestId, onSave) }
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                actions = {
-                    IconButton(onClick = { viewModel.submit(propertyId, guestId, onSave) }) {
-                        Icon(Icons.Default.Done, contentDescription = "Save")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             OutlinedTextField(
                 value = state.phoneE164,
                 onValueChange = viewModel::onPhoneChange,

app/src/main/java/com/android/trisolarispms/ui/guest/GuestSignatureScreen.kt

@@ -8,24 +8,17 @@ import androidx.compose.foundation.gestures.drag
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -48,9 +41,10 @@ import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import java.util.Locale
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun GuestSignatureScreen(
     propertyId: String,
     guestId: String,
@@ -66,15 +60,9 @@ fun GuestSignatureScreen(
         viewModel.reset()
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Guest Signature",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Guest Signature") },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
         actions = {
             IconButton(
                 onClick = {
@@ -91,18 +79,9 @@ fun GuestSignatureScreen(
                     Icon(Icons.Default.Done, contentDescription = "Upload")
                 }
             }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             Text(
                 text = "Please draw the guest signature below.",
                 style = MaterialTheme.typography.bodyMedium

app/src/main/java/com/android/trisolarispms/ui/home/HomeScreen.kt

@@ -4,7 +4,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -14,14 +13,10 @@ import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -36,9 +31,10 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.trisolarispms.core.auth.Role
 import com.android.trisolarispms.ui.property.PropertyListViewModel
 import androidx.compose.foundation.text.KeyboardOptions
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun HomeScreen(
     userId: String?,
     userName: String?,
@@ -78,11 +74,10 @@ fun HomeScreen(
         }
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Trisolaris PMS",
-            TopAppBar(
+        onBack = {},
-                title = { Text("Trisolaris PMS") },
+        showBack = false,
-                colors = TopAppBarDefaults.topAppBarColors(),
         actions = {
             if (isSuperAdmin) {
                 IconButton(onClick = onUserDirectory) {
@@ -128,16 +123,8 @@ fun HomeScreen(
                 }
             }
         }
-            )
-        }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             val title = if (!userName.isNullOrBlank()) "Welcome, $userName" else "Welcome"
             Text(text = title, style = MaterialTheme.typography.headlineMedium)
             if (isSuperAdmin) {

app/src/main/java/com/android/trisolarispms/ui/property/AddPropertyScreen.kt

@@ -3,27 +3,18 @@ package com.android.trisolarispms.ui.property
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.ExposedDropdownMenuDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -44,6 +35,8 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.util.UUID
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
@@ -70,26 +63,11 @@ fun AddPropertyScreen(
         }
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Add Property",
-            TopAppBar(
+        onBack = onBack
-                title = { Text("Add Property") },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             Spacer(modifier = Modifier.height(8.dp))
 
             ExposedDropdownMenuBox(

app/src/main/java/com/android/trisolarispms/ui/property/PropertyHomeScreen.kt

@@ -4,27 +4,19 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun PropertyHomeScreen(
     propertyId: String,
     onBack: () -> Unit,
@@ -33,26 +25,11 @@ fun PropertyHomeScreen(
     onRoomTypes: () -> Unit,
     canManageRooms: Boolean
 ) {
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Property",
-            TopAppBar(
+        onBack = onBack
-                title = { Text("Property") },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             PropertyTile(title = "Checked-in Rooms", subtitle = "Active stays", onClick = onActiveStays)
             Spacer(modifier = Modifier.height(12.dp))
             PropertyTile(title = "Available Rooms", subtitle = "Room list", onClick = onRooms)

app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpayQrScreen.kt

@@ -16,19 +16,14 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.clickable
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -49,9 +44,9 @@ import com.android.trisolarispms.BuildConfig
 import androidx.compose.ui.platform.LocalContext
 import android.content.Intent
 import android.net.Uri
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun RazorpayQrScreen(
     propertyId: String,
     bookingId: String,
@@ -93,23 +88,14 @@ fun RazorpayQrScreen(
         exitAndRefresh()
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Generate Payment Links | QR",
-            TopAppBar(
+        onBack = {
-                title = { Text("Generate Payment Links | QR") },
-                navigationIcon = {
-                    IconButton(onClick = {
             if (isViewingQr) {
                 exitAndRefresh()
             } else {
                 onBack()
             }
-                    }) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
         }
     ) { padding ->
         if (state.isCredited) {

app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysScreen.kt

@@ -3,7 +3,6 @@ package com.android.trisolarispms.ui.roomstay
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -13,7 +12,6 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.People
 import androidx.compose.material.icons.filled.MeetingRoom
 import androidx.compose.material.icons.filled.Payment
@@ -23,15 +21,11 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.material3.LinearProgressIndicator
@@ -43,11 +37,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.trisolarispms.data.api.model.BookingListItem
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 import java.time.Duration
 import java.time.OffsetDateTime
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun ActiveRoomStaysScreen(
     propertyId: String,
     propertyName: String,
@@ -73,17 +68,10 @@ fun ActiveRoomStaysScreen(
         viewModel.load(propertyId)
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = propertyName,
-            TopAppBar(
+        onBack = onBack,
-                title = { Text(propertyName) },
+        showBack = showBack,
-                navigationIcon = {
-                    if (showBack) {
-                        IconButton(onClick = onBack) {
-                            Icon(Icons.Default.ArrowBack, contentDescription = "Back")
-                        }
-                    }
-                },
         actions = {
             IconButton(onClick = onViewRooms) {
                 Icon(Icons.Default.MeetingRoom, contentDescription = "Available Rooms")
@@ -102,9 +90,6 @@ fun ActiveRoomStaysScreen(
                 }
             }
         },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        },
         floatingActionButton = {
             if (canCreateBooking) {
                 FloatingActionButton(onClick = onCreateBooking) {
@@ -113,13 +98,7 @@ fun ActiveRoomStaysScreen(
             }
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(padding = padding) {
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .padding(24.dp),
-            verticalArrangement = Arrangement.Top
-        ) {
             Spacer(modifier = Modifier.height(8.dp))
 
             if (state.isLoading) {

app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStayRatesScreen.kt

@@ -5,25 +5,16 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -36,9 +27,10 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.compose.foundation.text.KeyboardOptions
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun ManageRoomStayRatesScreen(
     propertyId: String,
     bookingId: String,
@@ -57,18 +49,9 @@ fun ManageRoomStayRatesScreen(
         viewModel.setItems(selectedRooms)
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Selected Rooms",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Selected Rooms") },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        },
         bottomBar = {
             Column(
                 modifier = Modifier
@@ -102,16 +85,13 @@ fun ManageRoomStayRatesScreen(
             }
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(
-            modifier = Modifier
+            padding = padding,
-                .fillMaxSize()
+            contentPadding = 16.dp
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.Top
         ) {
             if (state.items.isEmpty()) {
                 Text(text = "No rooms selected.")
-                return@Column
+                return@PaddedScreenColumn
             }
             state.items.forEach { item ->
                 Row(

app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStaySelectScreen.kt

@@ -17,18 +17,10 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -41,11 +33,13 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.trisolarispms.data.api.model.RoomAvailableRateResponse
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.LoadingAndError
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun ManageRoomStaySelectScreen(
     propertyId: String,
     bookingFromAt: String,
@@ -76,18 +70,9 @@ fun ManageRoomStaySelectScreen(
         }
     }
 
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = "Select Rooms",
-            TopAppBar(
+        onBack = onBack,
-                title = { Text("Select Rooms") },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
-        },
         bottomBar = {
             Column(
                 modifier = Modifier
@@ -112,23 +97,14 @@ fun ManageRoomStaySelectScreen(
             }
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(
-            modifier = Modifier
+            padding = padding,
-                .fillMaxSize()
+            contentPadding = 16.dp
-                .padding(padding)
-                .padding(16.dp)
         ) {
-            if (state.isLoading) {
+            LoadingAndError(isLoading = state.isLoading, error = state.error)
-                CircularProgressIndicator()
-                Spacer(modifier = Modifier.height(8.dp))
-            }
-            state.error?.let {
-                Text(text = it, color = MaterialTheme.colorScheme.error)
-                Spacer(modifier = Modifier.height(8.dp))
-            }
             if (fromDate == null || fallbackToDate == null) {
                 Text(text = "Booking dates not available.", color = MaterialTheme.colorScheme.error)
-                return@Column
+                return@PaddedScreenColumn
             }
             LazyVerticalGrid(
                 columns = GridCells.Fixed(2),

app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormScreen.kt

@@ -16,22 +16,16 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -45,9 +39,9 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
 import com.android.trisolarispms.data.api.core.ApiConstants
+import com.android.trisolarispms.ui.common.SaveTopBarScaffold
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun RoomTypeFormScreen(
     title: String,
     propertyId: String,
@@ -68,27 +62,16 @@ fun RoomTypeFormScreen(
         amenityViewModel.load()
     }
 
-    Scaffold(
+    SaveTopBarScaffold(
-        topBar = {
+        title = title,
-            TopAppBar(
+        onBack = onBack,
-                title = { Text(title) },
+        onSave = onSave,
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
         actions = {
-                    IconButton(onClick = onSave) {
-                        Icon(Icons.Default.Done, contentDescription = "Save")
-                    }
             if (onDelete != null) {
                 IconButton(onClick = onDelete) {
                     Icon(Icons.Default.Delete, contentDescription = "Delete Room Type")
                 }
             }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
         }
     ) { padding ->
         Column(

app/src/main/java/com/android/trisolarispms/ui/users/UserDirectoryScaffold.kt

@@ -3,36 +3,30 @@ package com.android.trisolarispms.ui.users
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.VpnKey
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import com.android.trisolarispms.ui.common.BackTopBarScaffold
+import com.android.trisolarispms.ui.common.LoadingAndError
+import com.android.trisolarispms.ui.common.PaddedScreenColumn
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 fun UserDirectoryScaffold(
     title: String,
     onBack: () -> Unit,
@@ -47,15 +41,9 @@ fun UserDirectoryScaffold(
     beforeListContent: @Composable () -> Unit = {},
     itemContent: @Composable (PropertyUserUi) -> Unit
 ) {
-    Scaffold(
+    BackTopBarScaffold(
-        topBar = {
+        title = title,
-            TopAppBar(
+        onBack = onBack,
-                title = { Text(title) },
-                navigationIcon = {
-                    IconButton(onClick = onBack) {
-                        Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
-                    }
-                },
         actions = {
             if (showAccessCodeIcon) {
                 IconButton(onClick = onAccessCodeClick) {
@@ -67,28 +55,15 @@ fun UserDirectoryScaffold(
                     Icon(Icons.Default.Search, contentDescription = "Search users")
                 }
             }
-                },
-                colors = TopAppBarDefaults.topAppBarColors()
-            )
         }
     ) { padding ->
-        Column(
+        PaddedScreenColumn(
-            modifier = Modifier
+            padding = padding,
-                .fillMaxSize()
+            contentPadding = 16.dp
-                .padding(padding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.Top
         ) {
             beforeListContent()
 
-            if (isLoading) {
+            LoadingAndError(isLoading = isLoading, error = error)
-                Spacer(modifier = Modifier.height(12.dp))
-                CircularProgressIndicator()
-            }
-            error?.let {
-                Spacer(modifier = Modifier.height(12.dp))
-                Text(text = it, color = MaterialTheme.colorScheme.error)
-            }
 
             Spacer(modifier = Modifier.height(12.dp))
             LazyColumn(verticalArrangement = Arrangement.spacedBy(12.dp)) {