بهبود ظاهری و بازطراحی کارت حالت دسترسی (اپراتور)

app/build.gradle.kts

@@ -30,8 +30,8 @@ android {
         applicationId = "com.oqba26.monthlypaymentapp"
         minSdk = 25
         targetSdk = 34
-        versionCode = 10
+        versionCode = 11
-        versionName = "1.0.9"
+        versionName = "1.1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
     }

app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/PersonScreen.kt

@@ -1168,7 +1168,7 @@ fun FinancialReportDialog(
             Card(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .heightIn(max = 600.dp),
+                    .heightIn(max = 650.dp),
                 shape = RoundedCornerShape(24.dp),
                 colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)
             ) {
@@ -1195,84 +1195,90 @@ fun FinancialReportDialog(
 
                     Spacer(modifier = Modifier.height(8.dp))
 
-                    Card(
+                    LazyColumn(
                         modifier = Modifier.fillMaxWidth(),
-                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f))
+                        verticalArrangement = Arrangement.spacedBy(10.dp)
                     ) {
-                        Column(
+                        item {
-                            modifier = Modifier.padding(12.dp),
+                            Card(
-                            verticalArrangement = Arrangement.spacedBy(6.dp)
-                        ) {
-                            Row(
                                 modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.SpaceBetween
+                                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.4f))
                             ) {
-                                Text("💰 کل درآمدهای تمام زمان‌ها:", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
+                                Column(
-                                Text("${formatNumberAsPersian(data.totalAllTimeIncome)} تومان", style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Bold)
+                                    modifier = Modifier.padding(12.dp),
-                            }
+                                    verticalArrangement = Arrangement.spacedBy(6.dp)
-                            Row(
+                                ) {
-                                modifier = Modifier.fillMaxWidth(),
+                                    Row(
-                                horizontalArrangement = Arrangement.SpaceBetween
+                                        modifier = Modifier.fillMaxWidth(),
-                            ) {
+                                        horizontalArrangement = Arrangement.SpaceBetween
-                                Text("🔴 کل بدهی‌های معوقه فعلی:", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.error)
+                                    ) {
-                                Text("${formatNumberAsPersian(data.totalOverdueDebt)} تومان (${data.totalDebtorsCount.toString().toPersianDigits()} نفر)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.error)
+                                        Text("💰 کل درآمدهای تمام زمان‌ها:", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold)
-                            }
+                                        Text("${formatNumberAsPersian(data.totalAllTimeIncome)} تومان", style = MaterialTheme.typography.bodyLarge, fontWeight = FontWeight.Bold)
-                        }
+                                    }
-                    }
+                                    Row(
-
+                                        modifier = Modifier.fillMaxWidth(),
-                    if (data.debtors.isNotEmpty()) {
+                                        horizontalArrangement = Arrangement.SpaceBetween
-                        Spacer(modifier = Modifier.height(8.dp))
+                                    ) {
-                        Card(
+                                        Text("🔴 کل بدهی‌های معوقه فعلی:", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.error)
-                            modifier = Modifier.fillMaxWidth(),
+                                        Text("${formatNumberAsPersian(data.totalOverdueDebt)} تومان (${data.totalDebtorsCount.toString().toPersianDigits()} نفر)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.error)
-                            colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.15f))
+                                    }
-                        ) {
-                            Column(
-                                modifier = Modifier.padding(12.dp),
-                                verticalArrangement = Arrangement.spacedBy(4.dp)
-                            ) {
-                                Text(
-                                    text = "لیست بدهکاران (${data.totalDebtorsCount.toString().toPersianDigits()} نفر):",
-                                    style = MaterialTheme.typography.titleSmall,
-                                    fontWeight = FontWeight.Bold,
-                                    color = MaterialTheme.colorScheme.error
-                                )
-                                val debtorNamesText = data.debtors.joinToString("، ") { 
-                                    "${it.personName} (${formatNumberAsPersian(it.totalDebtAmount)})" 
                                 }
+                            }
+                        }
+
+                        if (data.debtors.isNotEmpty()) {
+                            item {
+                                Card(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.15f))
+                                ) {
+                                    Column(
+                                        modifier = Modifier.padding(12.dp),
+                                        verticalArrangement = Arrangement.spacedBy(4.dp)
+                                    ) {
+                                        Text(
+                                            text = "لیست بدهکاران (${data.totalDebtorsCount.toString().toPersianDigits()} نفر):",
+                                            style = MaterialTheme.typography.titleSmall,
+                                            fontWeight = FontWeight.Bold,
+                                            color = MaterialTheme.colorScheme.error
+                                        )
+                                        val debtorNamesText = data.debtors.joinToString("، ") { 
+                                            "${it.personName} (${formatNumberAsPersian(it.totalDebtAmount)})" 
+                                        }
+                                        Text(
+                                            text = debtorNamesText,
+                                            style = MaterialTheme.typography.bodySmall,
+                                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                                        )
+                                    }
+                                }
+                            }
+                        }
+
+                        item {
+                            Column {
+                                HorizontalDivider(modifier = Modifier.padding(vertical = 4.dp))
                                 Text(
-                                    text = debtorNamesText,
+                                    text = "تفکیک درآمد ماهانه ماه‌های گذشته",
-                                    style = MaterialTheme.typography.bodySmall,
+                                    style = MaterialTheme.typography.titleMedium,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                                    fontWeight = FontWeight.Bold,
+                                    modifier = Modifier.padding(top = 4.dp)
                                 )
                             }
                         }
-                    }
 
-                    Spacer(modifier = Modifier.height(12.dp))
+                        if (data.monthlyReports.isEmpty()) {
-                    HorizontalDivider()
+                            item {
-                    Spacer(modifier = Modifier.height(8.dp))
+                                Box(
-
+                                    modifier = Modifier
-                    Text(
+                                        .fillMaxWidth()
-                        text = "تفکیک درآمد ماهانه ماه‌های گذشته",
+                                        .padding(24.dp),
-                        style = MaterialTheme.typography.titleMedium,
+                                    contentAlignment = Alignment.Center
-                        fontWeight = FontWeight.Bold,
+                                ) {
-                        modifier = Modifier.padding(bottom = 8.dp)
+                                    Text("هیچ دریافتی تا کنون ثبت نشده است.", style = MaterialTheme.typography.bodyMedium)
-                    )
+                                }
-
+                            }
-                    if (data.monthlyReports.isEmpty()) {
+                        } else {
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(24.dp),
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Text("هیچ دریافتی تا کنون ثبت نشده است.", style = MaterialTheme.typography.bodyMedium)
-                        }
-                    } else {
-                        LazyColumn(
-                            modifier = Modifier.weight(1f),
-                            verticalArrangement = Arrangement.spacedBy(8.dp)
-                        ) {
                             items(data.monthlyReports) { report ->
                                 Card(
                                     modifier = Modifier.fillMaxWidth(),
@@ -1319,15 +1325,6 @@ fun FinancialReportDialog(
                             }
                         }
                     }
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
-                    TextButton(
-                        onClick = onDismiss,
-                        modifier = Modifier.align(Alignment.End)
-                    ) {
-                        Text("بستن")
-                    }
                 }
             }
         }

app/src/main/java/com/oqba26/monthlypaymentapp/ui/screens/SettingsScreen.kt

@@ -46,6 +46,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -633,7 +634,7 @@ fun OperatorModeSetting(
     ) {
         Column(
             modifier = Modifier.padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(10.dp)
+            verticalArrangement = Arrangement.spacedBy(12.dp)
         ) {
             Row(
                 verticalAlignment = Alignment.CenterVertically,
@@ -648,18 +649,24 @@ fun OperatorModeSetting(
                         modifier = Modifier.size(24.dp)
                     )
                     Spacer(modifier = Modifier.width(8.dp))
-                    Column {
+                    Text(
-                        Text(
+                        text = "حالت دسترسی برنامه",
-                            text = "حالت دسترسی برنامه",
+                        style = MaterialTheme.typography.titleMedium,
-                            style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.Bold
-                            fontWeight = FontWeight.Bold
+                    )
-                        )
+                }
-                        Text(
+
-                            text = if (isOperatorMode) "وضعیت فعلی: حالت اپراتور (محدود)" else "وضعیت فعلی: حالت مدیریت (کامل)",
+                Surface(
-                            style = MaterialTheme.typography.bodySmall,
+                    color = if (isOperatorMode) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.primaryContainer,
-                            color = if (isOperatorMode) MaterialTheme.colorScheme.error else MaterialTheme.colorScheme.primary
+                    shape = RoundedCornerShape(12.dp)
-                        )
+                ) {
-                    }
+                    Text(
+                        text = if (isOperatorMode) "اپراتور (محدود)" else "مدیریت (کامل)",
+                        modifier = Modifier.padding(horizontal = 10.dp, vertical = 4.dp),
+                        style = MaterialTheme.typography.labelMedium,
+                        fontWeight = FontWeight.Bold,
+                        color = if (isOperatorMode) MaterialTheme.colorScheme.onErrorContainer else MaterialTheme.colorScheme.onPrimaryContainer
+                    )
                 }
             }
 
@@ -674,38 +681,51 @@ fun OperatorModeSetting(
                         showPinDialog = true
                     },
                     modifier = Modifier.fillMaxWidth(),
-                    shape = RoundedCornerShape(10.dp)
+                    shape = RoundedCornerShape(10.dp),
+                    colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary)
                 ) {
                     Icon(Icons.Default.LockOpen, contentDescription = null, modifier = Modifier.size(18.dp))
-                    Spacer(modifier = Modifier.width(6.dp))
+                    Spacer(modifier = Modifier.width(8.dp))
-                    Text("خروج از حالت اپراتور (ورود رمز مدیر)")
+                    Text("خروج از حالت اپراتور (ورود رمز مدیر)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold)
                 }
             } else {
-                Row(
+                OutlinedButton(
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    onClick = { onToggleMode(true) },
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier.fillMaxWidth(),
+                    shape = RoundedCornerShape(10.dp)
                 ) {
-                    Button(
+                    Icon(Icons.Default.Lock, contentDescription = null, modifier = Modifier.size(18.dp))
-                        onClick = { onToggleMode(true) },
+                    Spacer(modifier = Modifier.width(8.dp))
-                        modifier = Modifier.weight(1f),
+                    Text("فعال‌سازی حالت اپراتور (محدودسازی)", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold)
-                        shape = RoundedCornerShape(10.dp)
+                }
-                    ) {
-                        Text("فعال‌سازی حالت اپراتور", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold)
-                    }
 
-                    OutlinedButton(
+                Row(
-                        onClick = {
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable {
                             pinAction = PinAction.CHANGE_PIN
                             enteredPin = ""
                             newPinInput = ""
                             errorMessage = ""
                             showPinDialog = true
-                        },
+                        }
-                        modifier = Modifier.weight(1f),
+                        .padding(vertical = 4.dp),
-                        shape = RoundedCornerShape(10.dp)
+                    verticalAlignment = Alignment.CenterVertically,
-                    ) {
+                    horizontalArrangement = Arrangement.Center
-                        Text("تغییر رمز مدیر", style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold)
+                ) {
-                    }
+                    Icon(
+                        imageVector = Icons.Default.Edit,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary,
+                        modifier = Modifier.size(18.dp)
+                    )
+                    Spacer(modifier = Modifier.width(6.dp))
+                    Text(
+                        text = "تغییر رمز عبور مدیریت",
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = MaterialTheme.colorScheme.primary,
+                        fontWeight = FontWeight.SemiBold
+                    )
                 }
             }
         }

update.json

@@ -1,7 +1,7 @@
 {
-  "versionCode": 10,
+  "versionCode": 11,
-  "versionName": "1.0.9",
+  "versionName": "1.1.0",
-  "url": "https://github.com/oqba26/MonthlyPaymentApp/releases/download/v1.0.9/MonthlyPaymentApp-v1.0.9.apk",
+  "url": "https://github.com/oqba26/MonthlyPaymentApp/releases/download/v1.1.0/MonthlyPaymentApp-v1.1.0.apk",
-  "releaseNotes": "اصلاح اسکرول صفحه تنظیمات، بهبود ظاهری کارت حالت دسترسی و انتقال لیست اسامی بدهکاران به گزارش مالی",
+  "releaseNotes": "اصلاح اسکرول یکپارچه دیالوگ گزارش مالی و نمایش کامل تفکیک ماه‌های گذشته",
   "isForceUpdate": false
 }