Add contractor sharing feature and move settings to navigation bar

Contractor Sharing: - Add .casera file format for sharing contractors between users - Create SharedContractor model with JSON serialization - Implement ContractorSharingManager for iOS (Swift) and Android (Kotlin) - Register .casera file type in iOS Info.plist and Android manifest - Add share button to ContractorDetailView (iOS) and ContractorDetailScreen (Android) - Add import confirmation, success, and error dialogs - Create expect/actual platform implementations for sharing and import handling Navigation Changes: - Remove Profile tab from bottom tab bar (iOS and Android) - Add settings gear icon to left side of "My Properties" title - Settings gear opens Profile/Settings screen as sheet (iOS) or navigates (Android) - Add property button to top right action bar Bug Fixes: - Fix ResidenceUsersResponse to match API's flat array response format - Fix GenerateShareCodeResponse handling to access nested shareCode property - Update ManageUsersDialog to accept residenceOwnerId parameter 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-05 22:30:19 -06:00
parent 2965ec4031
commit 859a6679ed
43 changed files with 1848 additions and 148 deletions
--- a/composeApp/src/commonMain/kotlin/com/example/casera/ui/components/ContractorImportDialog.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/casera/ui/components/ContractorImportDialog.kt
@@ -0,0 +1,254 @@
+package com.example.casera.ui.components
+
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Error
+import androidx.compose.material.icons.filled.PersonAdd
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.example.casera.models.SharedContractor
+
+/**
+ * Dialog shown when a user attempts to import a contractor from a .casera file.
+ * Shows contractor details and asks for confirmation.
+ */
+@Composable
+fun ContractorImportConfirmDialog(
+    sharedContractor: SharedContractor,
+    isImporting: Boolean,
+    onConfirm: () -> Unit,
+    onDismiss: () -> Unit
+) {
+    AlertDialog(
+        onDismissRequest = { if (!isImporting) onDismiss() },
+        icon = {
+            Icon(
+                imageVector = Icons.Default.PersonAdd,
+                contentDescription = null,
+                modifier = Modifier.size(48.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
+        },
+        title = {
+            Text(
+                text = "Import Contractor",
+                style = MaterialTheme.typography.headlineSmall,
+                textAlign = TextAlign.Center
+            )
+        },
+        text = {
+            Column(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Text(
+                    text = "Would you like to import this contractor?",
+                    style = MaterialTheme.typography.bodyMedium,
+                    textAlign = TextAlign.Center
+                )
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                // Contractor details
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalAlignment = Alignment.Start
+                ) {
+                    Text(
+                        text = sharedContractor.name,
+                        style = MaterialTheme.typography.titleMedium,
+                        color = MaterialTheme.colorScheme.onSurface
+                    )
+
+                    sharedContractor.company?.let { company ->
+                        Text(
+                            text = company,
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+
+                    if (sharedContractor.specialtyNames.isNotEmpty()) {
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = sharedContractor.specialtyNames.joinToString(", "),
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.primary
+                        )
+                    }
+
+                    sharedContractor.exportedBy?.let { exportedBy ->
+                        Spacer(modifier = Modifier.height(8.dp))
+                        Text(
+                            text = "Shared by: $exportedBy",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                }
+            }
+        },
+        confirmButton = {
+            Button(
+                onClick = onConfirm,
+                enabled = !isImporting,
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.primary
+                )
+            ) {
+                if (isImporting) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(16.dp),
+                        strokeWidth = 2.dp,
+                        color = MaterialTheme.colorScheme.onPrimary
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text("Importing...")
+                } else {
+                    Text("Import")
+                }
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = onDismiss,
+                enabled = !isImporting
+            ) {
+                Text("Cancel")
+            }
+        }
+    )
+}
+
+/**
+ * Dialog shown after a contractor import attempt succeeds.
+ */
+@Composable
+fun ContractorImportSuccessDialog(
+    contractorName: String,
+    onDismiss: () -> Unit
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        icon = {
+            Icon(
+                imageVector = Icons.Default.CheckCircle,
+                contentDescription = null,
+                modifier = Modifier.size(48.dp),
+                tint = MaterialTheme.colorScheme.primary
+            )
+        },
+        title = {
+            Text(
+                text = "Contractor Imported",
+                style = MaterialTheme.typography.headlineSmall,
+                textAlign = TextAlign.Center
+            )
+        },
+        text = {
+            Text(
+                text = "$contractorName has been added to your contacts.",
+                style = MaterialTheme.typography.bodyMedium,
+                textAlign = TextAlign.Center
+            )
+        },
+        confirmButton = {
+            Button(
+                onClick = onDismiss,
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.primary
+                )
+            ) {
+                Text("OK")
+            }
+        }
+    )
+}
+
+/**
+ * Dialog shown after a contractor import attempt fails.
+ */
+@Composable
+fun ContractorImportErrorDialog(
+    errorMessage: String,
+    onRetry: (() -> Unit)? = null,
+    onDismiss: () -> Unit
+) {
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        icon = {
+            Icon(
+                imageVector = Icons.Default.Error,
+                contentDescription = null,
+                modifier = Modifier.size(48.dp),
+                tint = MaterialTheme.colorScheme.error
+            )
+        },
+        title = {
+            Text(
+                text = "Import Failed",
+                style = MaterialTheme.typography.headlineSmall,
+                color = MaterialTheme.colorScheme.error,
+                textAlign = TextAlign.Center
+            )
+        },
+        text = {
+            Text(
+                text = errorMessage,
+                style = MaterialTheme.typography.bodyMedium,
+                textAlign = TextAlign.Center
+            )
+        },
+        confirmButton = {
+            if (onRetry != null) {
+                Button(
+                    onClick = {
+                        onDismiss()
+                        onRetry()
+                    },
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.primary
+                    )
+                ) {
+                    Text("Try Again")
+                }
+            } else {
+                Button(
+                    onClick = onDismiss,
+                    colors = ButtonDefaults.buttonColors(
+                        containerColor = MaterialTheme.colorScheme.primary
+                    )
+                ) {
+                    Text("OK")
+                }
+            }
+        },
+        dismissButton = {
+            if (onRetry != null) {
+                TextButton(onClick = onDismiss) {
+                    Text("Cancel")
+                }
+            }
+        }
+    )
+}
--- a/composeApp/src/commonMain/kotlin/com/example/casera/ui/components/ManageUsersDialog.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/casera/ui/components/ManageUsersDialog.kt
@@ -24,11 +24,12 @@ fun ManageUsersDialog(
    residenceId: Int,
    residenceName: String,
    isPrimaryOwner: Boolean,
+    residenceOwnerId: Int,
    onDismiss: () -> Unit,
    onUserRemoved: () -> Unit = {}
 ) {
    var users by remember { mutableStateOf<List<ResidenceUser>>(emptyList()) }
-    var ownerId by remember { mutableStateOf<Int?>(null) }
+    val ownerId = residenceOwnerId
    var shareCode by remember { mutableStateOf<ResidenceShareCode?>(null) }
    var isLoading by remember { mutableStateOf(true) }
    var error by remember { mutableStateOf<String?>(null) }
@@ -46,8 +47,7 @@ fun ManageUsersDialog(
        if (token != null) {
            when (val result = residenceApi.getResidenceUsers(token, residenceId)) {
                is ApiResult.Success -> {
-                    users = result.data.users
-                    ownerId = result.data.owner.id
+                    users = result.data
                    isLoading = false
                }
                is ApiResult.Error -> {
--- a/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ContractorDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ContractorDetailScreen.kt
@@ -28,6 +28,7 @@ import com.example.casera.ui.components.HandleErrors
 import com.example.casera.util.DateUtils
 import com.example.casera.viewmodel.ContractorViewModel
 import com.example.casera.network.ApiResult
+import com.example.casera.platform.rememberShareContractor
 import casera.composeapp.generated.resources.*
 import org.jetbrains.compose.resources.stringResource

@@ -45,6 +46,8 @@ fun ContractorDetailScreen(
    var showEditDialog by remember { mutableStateOf(false) }
    var showDeleteConfirmation by remember { mutableStateOf(false) }

+    val shareContractor = rememberShareContractor()
+
    LaunchedEffect(contractorId) {
        viewModel.loadContractorDetail(contractorId)
    }
@@ -87,6 +90,9 @@ fun ContractorDetailScreen(
                actions = {
                    when (val state = contractorState) {
                        is ApiResult.Success -> {
+                            IconButton(onClick = { shareContractor(state.data) }) {
+                                Icon(Icons.Default.Share, stringResource(Res.string.common_share))
+                            }
                            IconButton(onClick = { viewModel.toggleFavorite(contractorId) }) {
                                Icon(
                                    if (state.data.isFavorite) Icons.Default.Star else Icons.Default.StarOutline,
--- a/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ResidenceDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ResidenceDetailScreen.kt
@@ -232,6 +232,7 @@ fun ResidenceDetailScreen(
            residenceId = residence.id,
            residenceName = residence.name,
            isPrimaryOwner = residence.ownerId == currentUser?.id,
+            residenceOwnerId = residence.ownerId,
            onDismiss = {
                showManageUsersDialog = false
            },
--- a/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ResidencesScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/example/casera/ui/screens/ResidencesScreen.kt
@@ -113,6 +113,15 @@ fun ResidencesScreen(
                        fontWeight = FontWeight.Bold
                    )
                },
+                navigationIcon = {
+                    IconButton(onClick = onNavigateToProfile) {
+                        Icon(
+                            Icons.Default.Settings,
+                            contentDescription = stringResource(Res.string.profile_title),
+                            tint = MaterialTheme.colorScheme.primary
+                        )
+                    }
+                },
                actions = {
                    // Only show Join button if not blocked (limit>0)
                    if (!isBlocked.allowed) {
@@ -128,11 +137,23 @@ fun ResidencesScreen(
                            Icon(Icons.Default.GroupAdd, contentDescription = stringResource(Res.string.properties_join_title))
                        }
                    }
-                    IconButton(onClick = onNavigateToProfile) {
-                        Icon(Icons.Default.AccountCircle, contentDescription = stringResource(Res.string.profile_title))
-                    }
-                    IconButton(onClick = onLogout) {
-                        Icon(Icons.Default.ExitToApp, contentDescription = stringResource(Res.string.home_logout))
+                    // Add property button
+                    if (!isBlocked.allowed) {
+                        IconButton(onClick = {
+                            val (allowed, triggerKey) = canAddProperty()
+                            if (allowed) {
+                                onAddResidence()
+                            } else {
+                                upgradeTriggerKey = triggerKey
+                                showUpgradePrompt = true
+                            }
+                        }) {
+                            Icon(
+                                Icons.Default.AddCircle,
+                                contentDescription = stringResource(Res.string.properties_add_button),
+                                tint = MaterialTheme.colorScheme.primary
+                            )
+                        }
                    }
                },
                colors = TopAppBarDefaults.topAppBarColors(